diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/SyncManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 11 | ||||
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 5 |
5 files changed, 19 insertions, 8 deletions
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 3d656c7..829b80c 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -45,6 +45,7 @@ public class StatusBarManager { public static final int DISABLE_RECENT = View.STATUS_BAR_DISABLE_RECENT; public static final int DISABLE_BACK = View.STATUS_BAR_DISABLE_BACK; public static final int DISABLE_CLOCK = View.STATUS_BAR_DISABLE_CLOCK; + public static final int DISABLE_SEARCH = View.STATUS_BAR_DISABLE_SEARCH; @Deprecated public static final int DISABLE_NAVIGATION = @@ -54,7 +55,8 @@ public class StatusBarManager { public static final int DISABLE_MASK = DISABLE_EXPAND | DISABLE_NOTIFICATION_ICONS | DISABLE_NOTIFICATION_ALERTS | DISABLE_NOTIFICATION_TICKER - | DISABLE_SYSTEM_INFO | DISABLE_RECENT | DISABLE_HOME | DISABLE_BACK | DISABLE_CLOCK; + | DISABLE_SYSTEM_INFO | DISABLE_RECENT | DISABLE_HOME | DISABLE_BACK | DISABLE_CLOCK + | DISABLE_SEARCH; public static final int NAVIGATION_HINT_BACK_NOP = 1 << 0; public static final int NAVIGATION_HINT_HOME_NOP = 1 << 1; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 97d299a..cf0603e 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2430,7 +2430,8 @@ public class Intent implements Parcelable, Cloneable { /** * Broadcast sent to the system when a user is removed. Carries an extra EXTRA_USER_HANDLE that has * the userHandle of the user. It is sent to all running users except the - * one that has been removed. You must hold + * one that has been removed. The user will not be completely removed until all receivers have + * handled the broadcast. You must hold * {@link android.Manifest.permission#MANAGE_USERS} to receive this broadcast. * @hide */ diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index bb0c686..05bab9c 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -265,7 +265,9 @@ public class SyncManager { } private void doDatabaseCleanup() { - for (UserInfo user : mUserManager.getUsers()) { + for (UserInfo user : mUserManager.getUsers(true)) { + // Skip any partially created/removed users + if (user.partial) continue; Account[] accountsForUser = AccountManagerService.getSingleton().getAccounts(user.id); mSyncStorageEngine.doDatabaseCleanup(accountsForUser, user.id); } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b36db7f..6360242 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2452,6 +2452,17 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** * @hide + * + * NOTE: This flag may only be used in subtreeSystemUiVisibility. It is masked + * out of the public fields to keep the undefined bits out of the developer's way. + * + * Flag to disable the global search gesture. Don't use this + * unless you're a special part of the system UI (i.e., setup wizard, keyguard). + */ + public static final int STATUS_BAR_DISABLE_SEARCH = 0x02000000; + + /** + * @hide */ public static final int PUBLIC_STATUS_BAR_VISIBILITY_MASK = 0x0000FFFF; diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index dabdf5a..c252c77 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -5990,11 +5990,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ @Override public void resolveLayoutDirection(int layoutDirection) { - // No need to resolve if it is the same layout direction as before - if (this.layoutDirection == layoutDirection) { - return; - } - setLayoutDirection(layoutDirection); if (!isMarginRelative()) return; |