Automerger Merge Worker
c294d8131a
DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 483da5385f am: 4314a0ca65
...
Change-Id: I2ede64f2853e854dc1bd7d6f0d8b16a96b6f1d12
2020-01-08 01:54:57 +00:00
Automerger Merge Worker
4314a0ca65
DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 483da5385f
...
Change-Id: Ia144921ee6ad424c565ca14713a275b9383e52cb
2020-01-08 01:35:27 +00:00
Automerger Merge Worker
3bb284492d
Support @left marker am: 21cc2e5f7d
...
Change-Id: I55bc7ee5b21dd5cf34da5944c7fad8169a34ca6d
2019-12-20 22:06:01 +00:00
Lucas Dupin
21cc2e5f7d
Support @left marker
...
By default cutouts are centered and support a @right marker to allow
them to be right aligned. Let's also support left alignment by
introducing a @left marker.
Test: atest DisplayCutoutTest
Test: manual
Bug: 143222961
Bug: 145707162
Change-Id: Ic5a645bd9f0513f3665f31c8b0f1861585bf30e6
Merged-In: Ic5a645bd9f0513f3665f31c8b0f1861585bf30e6
(cherry picked from commit 6e9636c5e0 )
2019-12-20 20:21:25 +00:00
Automerger Merge Worker
6366a55ac8
Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev am: e0f4421f23
...
Change-Id: I297d79d8f5262e68df0c294c938646a0acacbce8
2019-12-19 10:45:31 +00:00
TreeHugger Robot
e0f4421f23
Merge "Revert "Fix drag and drop (1/3)"" into qt-qpr1-dev
2019-12-19 07:49:32 +00:00
Automerger Merge Worker
b6349b363d
Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933 am: 6231cffbb8 am: 18c0fbfacd
...
Change-Id: Ic8cde8755fe5fce355931efb735c7d90fb857817
2019-12-17 23:58:44 +00:00
Automerger Merge Worker
18c0fbfacd
Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933 am: 6231cffbb8
...
Change-Id: I1653273a1d9c0eae7b8a8406bc188e2e909ffaa0
2019-12-17 23:43:26 +00:00
Automerger Merge Worker
6231cffbb8
Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933
...
Change-Id: Ic625ffed3ce23a7766a12a153d9794a4abf7a6b5
2019-12-17 23:31:47 +00:00
Andrew Solovay
3e4f4f9933
Merge "docs: Fixed typo" into qt-dev
2019-12-17 23:20:29 +00:00
Adam He
483da5385f
DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from
...
password fields.
Bug: 141703197
Test: atest android.autofillservice.cts.augmented
Change-Id: I09a75ad5674a0cfdb169b49461bfec2a129e781f
2019-12-16 16:39:28 -08:00
Andrew Solovay
b0c09e4ba6
docs: Fixed typo
...
Fixed a clear copy/paste error, docs had said "call getHeight() to
get the width" when it should have been "...to get the height".
Skipping staging since it's a simple text change.
Change-Id: Ic06557ac38517f409943585054835d774240ccf3
Test: make ds-docs
Exempt-from-owner-approval: Docs-only change
Bug: 144537947
2019-12-16 14:54:09 -08:00
Tony Mak
dbdf483f31
Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7
...
am: aea739b3f4
Change-Id: Ib5dfc58a7d53e0732959083fa2e6fcfd6e66f29d
2019-12-13 11:36:08 -08:00
Automerger Merge Worker
aea739b3f4
Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0 am: 056b56c6b7
...
Change-Id: Id17055f72243306cac9e46abff2cf313492f5e7c
2019-12-13 19:31:04 +00:00
Automerger Merge Worker
056b56c6b7
Merge "Put userId at the end of parcel" into qt-dev am: 899f8301e0
...
Change-Id: If6ce5c989102c8fb6cdc1fa82cde79817f6c3423
2019-12-13 19:11:21 +00:00
Tony Mak
642c22b223
Put userId at the end of parcel
...
userId is a new field added in ag/8350816, and it is written in between
some old fields when we parcelize it.
That breaks AiAi because some of its code rely on the implementation
details of SelectionEvent.writeToParcel.
In the long run, we may want to update AiAi such that it works
without this assumption, but before that, let's fix that in platform
for now.
Bug: 145962464
Bug: 123232892
Test: atest FrameworksCoreTests:android.view.textclassifier.SelectionEventTest
Merged-In: I98137a095cddf0fb4c600e1e09eef507bb750528
Change-Id: I66f65ac4c81ca964f710404fd081496355276435
2019-12-13 02:47:21 +00:00
Automerger Merge Worker
e06f253e8c
Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev am: d6e73ec8f1
...
Change-Id: I39643a2f6e7edc9af7221a295eb201cda3244534
2019-12-12 21:47:54 +00:00
Winson Chung
d6e73ec8f1
Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev
2019-12-12 21:27:08 +00:00
Automerger Merge Worker
6afb28c9c8
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev am: aced288d66 am: 62a0566244 am: be2826e8dc
...
Change-Id: I18e07c3ae09432469b8a3a8804b40c76676b64c0
2019-12-11 22:34:14 +00:00
Automerger Merge Worker
bae05149de
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6 am: bccb8bec0a
...
Change-Id: Id6995c02dc69230eab7cd1d312c4c4d569e44a25
2019-12-11 21:45:33 +00:00
Automerger Merge Worker
bccb8bec0a
RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply am: 34e380cdd6
...
Change-Id: I43130453f6b576679c52be643344589ac624dadd
2019-12-11 21:14:16 +00:00
TreeHugger Robot
aced288d66
Merge "RESTRICT AUTOMERGE TextClassifier cross-user vulnerability in direct-reply" into qt-dev
2019-12-11 20:55:34 +00:00
Arthur Hung
bc71da4f47
Revert "Fix drag and drop (1/3)"
...
This reverts commit 59f532efad .
Bug: 137819199
Test: manual
Change-Id: If5e8856aad74b6f232fff9d5fd746f56d63288eb
Merged-In: If5e8856aad74b6f232fff9d5fd746f56d63288eb
(cherry picked from commit c499ad3775 )
2019-12-09 09:31:45 +00:00
Tarandeep Singh
80e02c8b2c
DO NOT MERGE: Freeup lock when IME is set inactive and unbound
...
am: ad0a4a229a
Change-Id: Id4551d19bc2c05476c311a888a08aa8f5d449d20
2019-11-26 12:09:53 -08:00
Tarandeep Singh
7b729fa242
DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread
...
am: 4b6acb4f39
Change-Id: I4e7559656280d062544a37108800cb1e0db4c08c
2019-11-26 12:09:47 -08:00
TreeHugger Robot
c53b736775
Merge "DO NOT MERGE: Freeup lock when IME is set inactive and unbound" into qt-qpr1-dev
2019-11-26 19:42:45 +00:00
Tarandeep Singh
ad0a4a229a
DO NOT MERGE: Freeup lock when IME is set inactive and unbound
...
Any pending windowGainedFocus future should be cancelled when IME is
switched/unbound.
Additinally, startInputInner() inside synchronized block blocked
WINDOW_FOCUS_GAIN from executing. Its fine to remove synchronization
here since startInputInner() already has relevant synchronized blocks.
Change-Id: I98cb044d8cbfb80480312a3923f168aefa9b7e7d
Fix: 144103599
Bug: 139806621
Test: Manually using the steps in bug.
(cherry picked from commit 322ee9bf9e )
2019-11-23 04:14:49 +00:00
Tarandeep Singh
4b6acb4f39
DO NOT MERGE: Move startInput for WINDOW_FOCUS_GAIN to background thread
...
For a typical window with Editor, IMM#startInputOrWindowGainedFocus
is called twice: first for WINDOW_FOCUS_GAIN (dummyInput), then
CHECK_FOCUS when actual editor receives focus and startsInput.
The first once can be moved to background thread and second startInput
will wait till its finished.
Bug: 139806621
Test: Manually launch activities with editors and confirm no change in
behavior.
Change-Id: I6aa4a664cfd0c86f75cee2457715317194bbe5e2
(cherry picked from commit e0172102b9 )
2019-11-23 04:13:28 +00:00
Artur Satayev
79aff5c601
Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps." am: a98026f7aa
...
am: 59318bab67
Change-Id: Ic691d764839ecf34daa8b53aa92497e013c9a2a7
2019-11-13 10:40:54 -08:00
Artur Satayev
59318bab67
Merge "Add @UnsupportedAppUsage to test apis that are known to be used by apps."
...
am: a98026f7aa
Change-Id: Ia39fbc2200aa7262e4a05b0710b7a382bb01b276
2019-11-13 10:33:06 -08:00
Artur Satayev
5a525851a8
Add @UnsupportedAppUsage to test apis that are known to be used by apps.
...
go/testapi-enforcement
Bug: 133832325
Test: m
Change-Id: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
Merged-In: Ifc8db120640a1554dcbf1722e61e09c7ddc65dd6
2019-11-13 15:05:56 +00:00
Artur Satayev
756d3b447a
Merge "Add @UnsupportedAppUsage annotations for greylist." am: 423c3a32d6
...
am: 7a565c45b1
Change-Id: I48075ef4296e0b55c0055f7364c5129bbd60e9ed
2019-11-11 09:33:13 -08:00
Artur Satayev
7a565c45b1
Merge "Add @UnsupportedAppUsage annotations for greylist."
...
am: 423c3a32d6
Change-Id: I5387b4742fdaf67ad3189356f2361f73969b53a8
2019-11-11 09:13:24 -08:00
Joshua Baxter
6d92ef5ea5
Merge "docs: remove incorrect (default) identifiers" into qt-dev am: 2c7d94c7ed am: b2a8b29d10
...
am: 311218304a
Change-Id: I9a27040720cbf66e070403c3ae70f3fe5ce0c001
2019-11-08 15:34:36 -08:00
Joshua Baxter
311218304a
Merge "docs: remove incorrect (default) identifiers" into qt-dev am: 2c7d94c7ed
...
am: b2a8b29d10
Change-Id: Ie1d730b2777f85cd2a2d601576aeedd5e3728620
2019-11-08 15:26:57 -08:00
Joshua Baxter
b2a8b29d10
Merge "docs: remove incorrect (default) identifiers" into qt-dev
...
am: 2c7d94c7ed
Change-Id: I3b86d60b47443b7b3d50deccc81048b78c0e1dc7
2019-11-08 15:18:53 -08:00
Artur Satayev
3be4d59369
Merge "Add @UnsupportedAppUsage annotations for max-p." am: 8893f158c6
...
am: da4d6567c2
Change-Id: Iff80c388dec2c6f8184b739be6fb38b8ec8a1a49
2019-11-08 09:49:03 -08:00
Artur Satayev
da4d6567c2
Merge "Add @UnsupportedAppUsage annotations for max-p."
...
am: 8893f158c6
Change-Id: I2f249063c274b54a58a24cda23f1d5a60fa14540
2019-11-08 09:38:12 -08:00
Artur Satayev
fc46be7dbd
Add @UnsupportedAppUsage annotations for greylist.
...
go/cleanup-greylist-txt
These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.
Bug: 137350495
Test: m
Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Artur Satayev
ee9c6e7571
Add @UnsupportedAppUsage annotations for max-p.
...
See go/UnsupportedAppUsage for more details.
These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.
Bug: 137350495
Test: m
Change-Id: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
Merged-In: I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1
2019-11-08 16:17:13 +00:00
Joshua Baxter
5411869170
docs: remove incorrect (default) identifiers
...
Change-Id: I4ce6bc8a7b0e2f18055416a21f465cd2cfe4ec66
test: make ds-docs
bug: 112679894
2019-11-06 22:14:11 +00:00
Joshua Baxter
fc66e118db
Merge "docs: fix typos" into qt-dev am: d732cbb7bd am: 77514bd077
...
am: 208e73ca76
Change-Id: I492eb05a7292f17df50190ae5325e5c99bb0407e
2019-11-06 13:57:03 -08:00
Joshua Baxter
208e73ca76
Merge "docs: fix typos" into qt-dev am: d732cbb7bd
...
am: 77514bd077
Change-Id: I57d192cc779667458923fed99f71c7bf0ae1b8ff
2019-11-06 13:41:26 -08:00
Joshua Baxter
e9a62d5f86
Merge "docs: fix typos" into qt-dev am: 7bd7afabb8 am: 53fba24239
...
am: 20148858f5
Change-Id: Ibf2e7a9c1b8e31669226e4b27c5a09ae2ed1a219
2019-11-06 13:41:00 -08:00
Joshua Baxter
20148858f5
Merge "docs: fix typos" into qt-dev am: 7bd7afabb8
...
am: 53fba24239
Change-Id: I2d60f8aa3371e1fc77146e3571a3a89c5acaa253
2019-11-06 13:28:46 -08:00
Joshua Baxter
77514bd077
Merge "docs: fix typos" into qt-dev
...
am: d732cbb7bd
Change-Id: Ie5d13bceacd0392bebb797456c7ed3d0d2d906da
2019-11-06 13:26:00 -08:00
Joshua Baxter
53fba24239
Merge "docs: fix typos" into qt-dev
...
am: 7bd7afabb8
Change-Id: I2d9f0e92ac269000c9d0031d81e787688e44bdea
2019-11-06 13:21:12 -08:00
Joshua Baxter
d732cbb7bd
Merge "docs: fix typos" into qt-dev
2019-11-06 21:01:14 +00:00
Joshua Baxter
914bda7659
docs: fix typos
...
test: make ds-docs
bug: 36974889
2019-11-06 21:01:00 +00:00
Joshua Baxter
ec27701c78
docs: fix typos
...
Change-Id: Ie238360300cac54bd4717b4ff75d5534f82e0307
test: make ds-docs
bug: 36948876
2019-11-06 20:53:55 +00:00