diff options
Diffstat (limited to 'core')
18 files changed, 77 insertions, 76 deletions
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 6a51371..1cb0fd4 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1452,10 +1452,10 @@ final class ApplicationPackageManager extends PackageManager { } @Override - public boolean setApplicationBlockedSettingAsUser(String packageName, boolean blocked, + public boolean setApplicationHiddenSettingAsUser(String packageName, boolean hidden, UserHandle user) { try { - return mPM.setApplicationBlockedSettingAsUser(packageName, blocked, + return mPM.setApplicationHiddenSettingAsUser(packageName, hidden, user.getIdentifier()); } catch (RemoteException re) { // Should never happen! @@ -1464,9 +1464,9 @@ final class ApplicationPackageManager extends PackageManager { } @Override - public boolean getApplicationBlockedSettingAsUser(String packageName, UserHandle user) { + public boolean getApplicationHiddenSettingAsUser(String packageName, UserHandle user) { try { - return mPM.getApplicationBlockedSettingAsUser(packageName, user.getIdentifier()); + return mPM.getApplicationHiddenSettingAsUser(packageName, user.getIdentifier()); } catch (RemoteException re) { // Should never happen! } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 5f2262b..efeded5 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2523,20 +2523,20 @@ public class DevicePolicyManager { } /** - * Called by device or profile owner to block or unblock packages. When a package is blocked it + * Called by device or profile owner to hide or unhide packages. When a package is hidden it * is unavailable for use, but the data and actual package file remain. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @param packageName The name of the package to block or unblock. - * @param blocked {@code true} if the package should be blocked, {@code false} if it should be - * unblocked. - * @return boolean Whether the blocked setting of the package was successfully updated. + * @param packageName The name of the package to hide or unhide. + * @param hidden {@code true} if the package should be hidden, {@code false} if it should be + * unhidden. + * @return boolean Whether the hidden setting of the package was successfully updated. */ - public boolean setApplicationBlocked(ComponentName admin, String packageName, - boolean blocked) { + public boolean setApplicationHidden(ComponentName admin, String packageName, + boolean hidden) { if (mService != null) { try { - return mService.setApplicationBlocked(admin, packageName, blocked); + return mService.setApplicationHidden(admin, packageName, hidden); } catch (RemoteException e) { Log.w(TAG, "Failed talking with device policy service", e); } @@ -2545,20 +2545,20 @@ public class DevicePolicyManager { } /** - * Called by profile or device owner to block or unblock currently installed packages. This + * Called by profile or device owner to hide or unhide currently installed packages. This * should only be called by a profile or device owner running within a managed profile. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param intent An intent matching the app(s) to be updated. All apps that resolve for this * intent will be updated in the current profile. - * @param blocked {@code true} if the packages should be blocked, {@code false} if they should - * be unblocked. + * @param hidden {@code true} if the packages should be hidden, {@code false} if they should + * be unhidden. * @return int The number of activities that matched the intent and were updated. */ - public int setApplicationsBlocked(ComponentName admin, Intent intent, boolean blocked) { + public int setApplicationsHidden(ComponentName admin, Intent intent, boolean hidden) { if (mService != null) { try { - return mService.setApplicationsBlocked(admin, intent, blocked); + return mService.setApplicationsHidden(admin, intent, hidden); } catch (RemoteException e) { Log.w(TAG, "Failed talking with device policy service", e); } @@ -2567,16 +2567,16 @@ public class DevicePolicyManager { } /** - * Called by device or profile owner to determine if a package is blocked. + * Called by device or profile owner to determine if a package is hidden. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @param packageName The name of the package to retrieve the blocked status of. - * @return boolean {@code true} if the package is blocked, {@code false} otherwise. + * @param packageName The name of the package to retrieve the hidden status of. + * @return boolean {@code true} if the package is hidden, {@code false} otherwise. */ - public boolean isApplicationBlocked(ComponentName admin, String packageName) { + public boolean isApplicationHidden(ComponentName admin, String packageName) { if (mService != null) { try { - return mService.isApplicationBlocked(admin, packageName); + return mService.isApplicationHidden(admin, packageName); } catch (RemoteException e) { Log.w(TAG, "Failed talking with device policy service", e); } diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 9b1979f..5fc8c5f 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -132,9 +132,9 @@ interface IDevicePolicyManager { void addCrossProfileIntentFilter(in ComponentName admin, in IntentFilter filter, int flags); void clearCrossProfileIntentFilters(in ComponentName admin); - boolean setApplicationBlocked(in ComponentName admin, in String packageName, boolean blocked); - int setApplicationsBlocked(in ComponentName admin, in Intent intent, boolean blocked); - boolean isApplicationBlocked(in ComponentName admin, in String packageName); + boolean setApplicationHidden(in ComponentName admin, in String packageName, boolean hidden); + int setApplicationsHidden(in ComponentName admin, in Intent intent, boolean hidden); + boolean isApplicationHidden(in ComponentName admin, in String packageName); UserHandle createUser(in ComponentName who, in String name); UserHandle createAndInitializeUser(in ComponentName who, in String name, in String profileOwnerName, in ComponentName profileOwnerComponent, in Bundle adminExtras); diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 95bd480..482ad6e 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -334,11 +334,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public static final int FLAG_FULL_BACKUP_ONLY = 1<<26; /** - * Value for {@link #flags}: true if the application is blocked via restrictions and for + * Value for {@link #flags}: true if the application is hidden via restrictions and for * most purposes is considered as not installed. * {@hide} */ - public static final int FLAG_BLOCKED = 1<<27; + public static final int FLAG_HIDDEN = 1<<27; /** * Value for {@link #flags}: set to <code>true</code> if the application diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index eb46cf0..5e55ba7 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -428,8 +428,8 @@ interface IPackageManager { /** Reflects current DeviceStorageMonitorService state */ boolean isStorageLow(); - boolean setApplicationBlockedSettingAsUser(String packageName, boolean blocked, int userId); - boolean getApplicationBlockedSettingAsUser(String packageName, int userId); + boolean setApplicationHiddenSettingAsUser(String packageName, boolean hidden, int userId); + boolean getApplicationHiddenSettingAsUser(String packageName, int userId); IPackageInstaller getPackageInstaller(); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index b4c0219..8b6ae41 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3642,20 +3642,21 @@ public abstract class PackageManager { public abstract int getApplicationEnabledSetting(String packageName); /** - * Puts the package in a blocked state, which is almost like an uninstalled state, + * Puts the package in a hidden state, which is almost like an uninstalled state, * making the package unavailable, but it doesn't remove the data or the actual - * package file. + * package file. Application can be unhidden by either resetting the hidden state + * or by installing it, such as with {@link #installExistingPackage(String)} * @hide */ - public abstract boolean setApplicationBlockedSettingAsUser(String packageName, boolean blocked, + public abstract boolean setApplicationHiddenSettingAsUser(String packageName, boolean hidden, UserHandle userHandle); /** - * Returns the blocked state of a package. - * @see #setApplicationBlockedSettingAsUser(String, boolean, UserHandle) + * Returns the hidden state of a package. + * @see #setApplicationHiddenSettingAsUser(String, boolean, UserHandle) * @hide */ - public abstract boolean getApplicationBlockedSettingAsUser(String packageName, + public abstract boolean getApplicationHiddenSettingAsUser(String packageName, UserHandle userHandle); /** diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 833dc21..9866200 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -382,23 +382,23 @@ public class PackageParser { } /** - * Returns true if the package is installed and not blocked, or if the caller - * explicitly wanted all uninstalled and blocked packages as well. + * Returns true if the package is installed and not hidden, or if the caller + * explicitly wanted all uninstalled and hidden packages as well. */ - private static boolean checkUseInstalledOrBlocked(int flags, PackageUserState state) { - return (state.installed && !state.blocked) + private static boolean checkUseInstalledOrHidden(int flags, PackageUserState state) { + return (state.installed && !state.hidden) || (flags & PackageManager.GET_UNINSTALLED_PACKAGES) != 0; } public static boolean isAvailable(PackageUserState state) { - return checkUseInstalledOrBlocked(0, state); + return checkUseInstalledOrHidden(0, state); } public static PackageInfo generatePackageInfo(PackageParser.Package p, int gids[], int flags, long firstInstallTime, long lastUpdateTime, HashSet<String> grantedPermissions, PackageUserState state, int userId) { - if (!checkUseInstalledOrBlocked(flags, state)) { + if (!checkUseInstalledOrHidden(flags, state)) { return null; } PackageInfo pi = new PackageInfo(); @@ -4533,7 +4533,7 @@ public class PackageParser { return true; } } - if (!state.installed || state.blocked) { + if (!state.installed || state.hidden) { return true; } if (state.stopped) { @@ -4566,10 +4566,10 @@ public class PackageParser { } else { ai.flags &= ~ApplicationInfo.FLAG_INSTALLED; } - if (state.blocked) { - ai.flags |= ApplicationInfo.FLAG_BLOCKED; + if (state.hidden) { + ai.flags |= ApplicationInfo.FLAG_HIDDEN; } else { - ai.flags &= ~ApplicationInfo.FLAG_BLOCKED; + ai.flags &= ~ApplicationInfo.FLAG_HIDDEN; } if (state.enabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) { ai.enabled = true; @@ -4585,7 +4585,7 @@ public class PackageParser { public static ApplicationInfo generateApplicationInfo(Package p, int flags, PackageUserState state, int userId) { if (p == null) return null; - if (!checkUseInstalledOrBlocked(flags, state)) { + if (!checkUseInstalledOrHidden(flags, state)) { return null; } if (!copyNeeded(flags, p, state, null, userId) @@ -4673,7 +4673,7 @@ public class PackageParser { public static final ActivityInfo generateActivityInfo(Activity a, int flags, PackageUserState state, int userId) { if (a == null) return null; - if (!checkUseInstalledOrBlocked(flags, state)) { + if (!checkUseInstalledOrHidden(flags, state)) { return null; } if (!copyNeeded(flags, a.owner, state, a.metaData, userId)) { @@ -4714,7 +4714,7 @@ public class PackageParser { public static final ServiceInfo generateServiceInfo(Service s, int flags, PackageUserState state, int userId) { if (s == null) return null; - if (!checkUseInstalledOrBlocked(flags, state)) { + if (!checkUseInstalledOrHidden(flags, state)) { return null; } if (!copyNeeded(flags, s.owner, state, s.metaData, userId)) { @@ -4763,7 +4763,7 @@ public class PackageParser { public static final ProviderInfo generateProviderInfo(Provider p, int flags, PackageUserState state, int userId) { if (p == null) return null; - if (!checkUseInstalledOrBlocked(flags, state)) { + if (!checkUseInstalledOrHidden(flags, state)) { return null; } if (!copyNeeded(flags, p.owner, state, p.metaData, userId) diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java index f0d4cb1..4dcad6f 100644 --- a/core/java/android/content/pm/PackageUserState.java +++ b/core/java/android/content/pm/PackageUserState.java @@ -28,7 +28,7 @@ public class PackageUserState { public boolean stopped; public boolean notLaunched; public boolean installed; - public boolean blocked; // Is the app restricted by owner / admin + public boolean hidden; // Is the app restricted by owner / admin public int enabled; public boolean blockUninstall; @@ -39,7 +39,7 @@ public class PackageUserState { public PackageUserState() { installed = true; - blocked = false; + hidden = false; enabled = COMPONENT_ENABLED_STATE_DEFAULT; } @@ -48,7 +48,7 @@ public class PackageUserState { stopped = o.stopped; notLaunched = o.notLaunched; enabled = o.enabled; - blocked = o.blocked; + hidden = o.hidden; lastDisableAppCaller = o.lastDisableAppCaller; disabledComponents = o.disabledComponents != null ? new HashSet<String>(o.disabledComponents) : null; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index d9ad1f1..671aa10 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -468,13 +468,8 @@ public final class ViewRootImpl implements ViewParent, // Compute surface insets required to draw at specified Z value. // TODO: Use real shadow insets for a constant max Z. - if (view.isHardwareAccelerated()) { - final int surfaceInset = (int) Math.ceil(view.getZ() * 2); - attrs.surfaceInsets.set(surfaceInset, surfaceInset, surfaceInset, surfaceInset); - } else { - // Software accelerated windows can't use insets. - attrs.surfaceInsets.setEmpty(); - } + final int surfaceInset = (int) Math.ceil(view.getZ() * 2); + attrs.surfaceInsets.set(surfaceInset, surfaceInset, surfaceInset, surfaceInset); CompatibilityInfo compatibilityInfo = mDisplayAdjustments.getCompatibilityInfo(); mTranslator = compatibilityInfo.getTranslator(); diff --git a/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex 7c77a45..b9a81be 100644 --- a/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-hdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png Binary files differindex bc6da21..3682629 100644 --- a/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-hdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex 7a72295..f3d06fe 100644 --- a/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-mdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png Binary files differindex 483931f..f0e7db8 100644 --- a/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-mdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex 16c376a..7174b67 100644 --- a/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-xhdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png Binary files differindex e3bd904..46dad22 100644 --- a/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-xhdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png Binary files differindex a22f352..661d5f0 100644 --- a/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png +++ b/core/res/res/drawable-xxhdpi/textfield_activated_mtrl_alpha.9.png diff --git a/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png b/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png Binary files differindex b0504e0..d7696c3 100644 --- a/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png +++ b/core/res/res/drawable-xxhdpi/textfield_default_mtrl_alpha.9.png diff --git a/core/res/res/drawable/edit_text_material.xml b/core/res/res/drawable/edit_text_material.xml index 86cec8f..eaf5e45 100644 --- a/core/res/res/drawable/edit_text_material.xml +++ b/core/res/res/drawable/edit_text_material.xml @@ -14,20 +14,25 @@ limitations under the License. --> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?attr/colorControlActivated"> - <item> - <selector> - <item android:state_enabled="false"> - <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" - android:tint="?attr/colorControlNormal" - android:alpha="?attr/disabledAlpha" /> - </item> - <item> - <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" - android:tint="?attr/colorControlNormal" /> - </item> - </selector> - </item> - <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" /> -</ripple> +<inset xmlns:android="http://schemas.android.com/apk/res/android" + android:insetLeft="@dimen/control_inset_material" + android:insetTop="@dimen/control_inset_material" + android:insetBottom="@dimen/control_inset_material" + android:insetRight="@dimen/control_inset_material"> + <ripple android:color="?attr/colorControlActivated"> + <item> + <selector> + <item android:state_enabled="false"> + <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" + android:tint="?attr/colorControlNormal" + android:alpha="?attr/disabledAlpha" /> + </item> + <item> + <nine-patch android:src="@drawable/textfield_default_mtrl_alpha" + android:tint="?attr/colorControlNormal" /> + </item> + </selector> + </item> + <item android:id="@+id/mask" android:drawable="@drawable/textfield_activated_mtrl_alpha" /> + </ripple> +</inset> |
