Xin Li
c12cc62208
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7 -s ours
...
am: 59b1a2f6bb
2019-07-02 11:41:19 -07:00
Neil Fuller
46e53e770c
Merge "Add tobiast@ to the OWNERS file"
...
am: a931693721
2019-07-02 10:13:36 -07:00
Xin Li
59b1a2f6bb
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 0a68e9bfe7
2019-07-02 10:04:54 -07:00
Neil Fuller
a931693721
Merge "Add tobiast@ to the OWNERS file"
2019-07-02 14:27:55 +00:00
Neil Fuller
ca6542843c
Add tobiast@ to the OWNERS file
...
Add tobiast@ to the OWNERS file as libcore TL.
Remove pszczepaniak@ as he hasn't been on libcore
for a while.
Test: None
Change-Id: I714d3448ed60006cb58a0f49e95b7b834a6aac36
2019-07-02 10:55:50 +01:00
Bill Yi
7ed2100d0e
[automerger skipped] Import translations. DO NOT MERGE
...
am: da20a84f9b
2019-07-01 16:21:34 -07:00
Xin Li
0a68e9bfe7
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I298dd1232c7e304b5d2cd9fda59006d08026698a
2019-07-01 21:00:04 +00:00
Bill Yi
da20a84f9b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6ab947284694fa3922d185f58f57c5acfd83b2ee
2019-07-01 12:27:35 -07:00
Robert Snoeberger
a350189b88
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
2019-07-01 10:34:22 -07:00
Robert Snoeberger
a4a25871d4
Merge "Remove "clocks" from string" into qt-r1-dev
2019-07-01 17:19:27 +00:00
Robert Snoeberger
0e65d651d1
Remove "clocks" from string
...
Fixes: 136193731
Bug: 136090066
Test: manual
Change-Id: I63751bb31016754930a4773d791f118103026ada
2019-07-01 17:12:16 +00:00
Amin Shaikh
fea6983c2b
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
2019-07-01 05:08:46 -07:00
TreeHugger Robot
0217400ea5
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
2019-07-01 11:52:33 +00:00
Bill Yi
1b807c64c4
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours
...
am: ae58e057d7
2019-07-01 03:00:39 -07:00
Bill Yi
ebe3b061ee
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 512b97f994
2019-07-01 02:59:21 -07:00
Bill Yi
def50c6ed1
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours
...
am: d1bdb4f72d
2019-07-01 02:58:20 -07:00
Bill Yi
ae58e057d7
[automerger skipped] Import translations. DO NOT MERGE
...
am: 26a2694bd3
2019-07-01 02:45:08 -07:00
Bill Yi
d1bdb4f72d
[automerger skipped] Import translations. DO NOT MERGE
...
am: 26a2694bd3
2019-07-01 02:42:17 -07:00
TreeHugger Robot
512b97f994
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-01 09:35:04 +00:00
Pasty Chang
f458782f7e
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
...
am: 2ba113898a
2019-06-30 18:57:28 -07:00
Pasty Chang
2ba113898a
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
2019-07-01 01:20:54 +00:00
Bill Yi
9690c70312
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If33daab9a7d9e2c88b602147d66da40968412de6
2019-06-30 15:39:46 -07:00
Bill Yi
26a2694bd3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I047beafb83c4c8df261fb5ac7c49dd81cb4470e0
2019-06-30 14:58:27 -07:00
tmfang
ef24931fd8
Merge "Add summary for white balance feature" into qt-r1-dev
...
am: 9cd8167bff
2019-06-29 04:41:31 -07:00
TreeHugger Robot
9cd8167bff
Merge "Add summary for white balance feature" into qt-r1-dev
2019-06-29 10:57:45 +00:00
Andrew Sapperstein
bd5934623e
Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a
...
am: 647f685063
2019-06-28 14:55:07 -07:00
Yanting Yang
925f5929de
Fix RTL issue of Deferred Setup card
...
am: f6972b29b1
2019-06-28 14:54:39 -07:00
Winson Chung
0839b6fdc7
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
...
am: 8d08713c96
2019-06-28 14:54:28 -07:00
Evan Severson
e7f084deb2
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
...
am: f461d8dc52
2019-06-28 14:54:07 -07:00
Joel Galenson
9aa82c09fe
Remove Permissions Hub. DO NOT MERGE
...
am: 69d9899868
2019-06-28 14:54:06 -07:00
Amin Shaikh
3e484def2f
Update Settings overlayed icons.
...
am: c477507f4e
2019-06-28 14:53:48 -07:00
Kevin Chyn
95634cace1
Send userId together with enroll / setFeature / getFeature method update
...
Test: Enroll E2E
Bug: 136264301
Change-Id: Ie3f98ab80c831083d750d9459ed7a189df25dd66
2019-06-28 13:42:20 -07:00
Amin Shaikh
84c3f60ef5
Update ic_sync_problem to GM2.
...
- Use tint instead of custom fillColor to be consistent with overlays.
- Standardize on using @android:color/white as fill color
- Update list of overlayed icons.
Bug: 131346125
Test: make
Change-Id: I4bc88e5842ba2f149356929a77b81459ce5042c5
2019-06-28 16:35:24 -04:00
Andrew Sapperstein
722f8c0ac1
Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a
...
am: 0c1f7da25a
2019-06-28 10:47:58 -07:00
Andrew Sapperstein
647f685063
Merge "Add UI for mainline modules licenses." into qt-dev
...
am: 72aded338a
2019-06-28 10:32:22 -07:00
Andrew Sapperstein
0c1f7da25a
Merge "Add UI for mainline modules licenses." into qt-dev
...
am: 72aded338a
2019-06-28 10:28:07 -07:00
Andrew Sapperstein
72aded338a
Merge "Add UI for mainline modules licenses." into qt-dev
2019-06-28 16:56:04 +00:00
Yanting Yang
f6972b29b1
Fix RTL issue of Deferred Setup card
...
Correct layout gravity to "start" to apply RTL layout.
Fixes: 131913172
Test: visual
Change-Id: I5935c5c1415070803141634ff4e92f1c65fc94f6
(cherry picked from commit c200df360c
2019-06-28 00:17:32 +00:00
Winson Chung
27424848e8
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
...
am: 8bf207bab6
2019-06-27 16:37:13 -07:00
Winson Chung
8bf207bab6
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
...
am: 9591c3f963
2019-06-27 16:24:53 -07:00
Winson Chung
8d08713c96
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
...
am: 9591c3f963
2019-06-27 16:23:53 -07:00
Winson Chung
9591c3f963
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
2019-06-27 22:47:14 +00:00
Evan Severson
f461d8dc52
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
2019-06-27 21:21:56 +00:00
Amin Shaikh
c477507f4e
Update Settings overlayed icons.
...
- Use tint instead of custom fillColor to be consistent with overlays.
- Update list of overlayed icons.
Bug: 131346125
Test: make
Change-Id: Ib548c0b47db0064bcb1536c9b7a650912f28273f
Merged-In: Ib548c0b47db0064bcb1536c9b7a650912f28273f
2019-06-27 14:49:20 +00:00
Louis Chang
397cdd6ead
Adding unique task affinity for FallbackHome activity
...
Settings activities were launched and resided on home task
which was originally started by FallbackHome. Adding a
unique task affinity for FallbackHome activity in order to
prevent the task being reused by other Settings activities.
Bug: 135696366
Test: starting Settings activity before FallbackHome finishes
Change-Id: I3fe41dd3b77e37236b11006dbf08727783b6a2ec
2019-06-27 09:57:54 +08:00
Joel Galenson
69d9899868
Remove Permissions Hub. DO NOT MERGE
...
Bug: 132292477
Test: View all related screens.
(cherry picked from commit 1e7c172ad5
2019-06-26 20:58:18 +00:00
markchien
0331222483
Fix entitlement failed when device is on CBRS
...
When active cellular internet is switched to CBRS in DSDS case,
default data sub id may not be changed. Fix by using active
subscription id and pass this sub id to entitlement app.
Bug: 134994718
Test: atest TetherServiceTest
Test: manual test with carrer SIMs.
Change-Id: I30a1d70c0690f0dba8f4171a2bde884f9b7ccfc4
2019-06-26 17:05:48 +00:00
Sunny Shao
1ae1523a91
Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
...
am: 27067657f2
2019-06-26 04:44:02 -07:00
Sunny Shao
e4310ea096
Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
...
am: bfffb2ae74
2019-06-26 04:43:25 -07:00
pastychang
f3b5f0adfe
Fix status bar color of a11y doesn't apply stencil
...
View of content parent should not account for system screen decorations
and make statusbar layout can be overrided by stencil customization.
Bug: 126065441
Test: Manual
Change-Id: Iefbdc4a0613e1ae0b63c35769f1c8ec9581d7869
2019-06-26 19:36:08 +08:00
