Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix FLAGS_ALL_CONTROL to match more recently added flags."

Browse Source
This commit is contained in:
Adam He
2021-07-29 18:18:07 +00:00
committed by Android (Google) Code Review
parent d118e25cae 1481996b33
commit 499b4cf331
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/assist/AssistStructure.java
View File

@@ -658,6 +658,7 @@ public class AssistStructure implements Parcelable {
float mElevation;
float mAlpha = 1.0f;
// TODO: The FLAGS_* below have filled all bits, will need to be refactored.
static final int FLAGS_DISABLED = 0x00000001;
static final int FLAGS_VISIBILITY_MASK = View.VISIBLE|View.INVISIBLE|View.GONE;
static final int FLAGS_FOCUSABLE = 0x00000010;
@@ -673,6 +674,10 @@ public class AssistStructure implements Parcelable {
static final int FLAGS_CONTEXT_CLICKABLE = 0x00004000;
static final int FLAGS_OPAQUE = 0x00008000;
// --IMPORTANT-- must update this flag if any below flags extend to further bits.
// This flag is used to clear all FLAGS_HAS_* values in mFlags prior to parceling.
static final int FLAGS_ALL_CONTROL = 0xffff0000;
static final int FLAGS_HAS_MIME_TYPES = 0x80000000;
static final int FLAGS_HAS_MATRIX = 0x40000000;
static final int FLAGS_HAS_ALPHA = 0x20000000;
@@ -689,7 +694,7 @@ public class AssistStructure implements Parcelable {
static final int FLAGS_HAS_INPUT_TYPE = 0x00040000;
static final int FLAGS_HAS_URL_SCHEME = 0x00020000;
static final int FLAGS_HAS_LOCALE_LIST = 0x00010000;
static final int FLAGS_ALL_CONTROL = 0xfff00000;
// --IMPORTANT END--
static final int AUTOFILL_FLAGS_HAS_AUTOFILL_VIEW_ID = 0x0001;
static final int AUTOFILL_FLAGS_HAS_AUTOFILL_VIRTUAL_VIEW_ID = 0x0002;