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
26688e912f
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
Change-Id: I1236d44d730c5c24569002c4aab4c600b653706e
2019-07-01 10:36:26 -07:00
Robert Snoeberger
a350189b88
Merge "Remove "clocks" from string" into qt-r1-dev
...
am: a4a25871d4
Change-Id: I8181952741bdb57785a48485cb09072fb38484f2
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
13ac03cc8d
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
Change-Id: Id0dde389a42cf51d3bbabcd5476058f0acff44ad
2019-07-01 05:09:31 -07:00
Amin Shaikh
fea6983c2b
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
...
am: 0217400ea5
Change-Id: I5c9d11a15eb86f60d91ebd3110ccc33fdefdf981
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 -s ours
am skip reason: subject contains skip directive
Change-Id: Ieed2fbbaf549747d717c21c09758d2d72a641591
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 -s ours
am skip reason: subject contains skip directive
Change-Id: Iba6a4ef13d883f417bf6d88ead82a9b5b40a97f2
2019-07-01 02:59:21 -07:00
Bill Yi
9eff336d66
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours
...
am: ae58e057d7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibf26ca776141d30988f7ac69f14b7023d946d7fc
2019-07-01 02:58:55 -07:00
Bill Yi
a02965899f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 512b97f994 -s ours
am skip reason: subject contains skip directive
Change-Id: I2b9b5e64590a28f14e95fbca98b54806b10e1f62
2019-07-01 02:58:21 -07:00
Bill Yi
def50c6ed1
[automerger skipped] Import translations. DO NOT MERGE am: 26a2694bd3 -s ours
...
am: d1bdb4f72d -s ours
am skip reason: subject contains skip directive
Change-Id: Ieb16394e9bfe0e0b80eb0a4b66085fe2ffe0f4e2
2019-07-01 02:58:20 -07:00
Bill Yi
ae58e057d7
[automerger skipped] Import translations. DO NOT MERGE
...
am: 26a2694bd3 -s ours
am skip reason: subject contains skip directive
Change-Id: I2c38c37556229f6ce9ac6acbbd5367bd239ff1ff
2019-07-01 02:45:08 -07:00
Bill Yi
d1bdb4f72d
[automerger skipped] Import translations. DO NOT MERGE
...
am: 26a2694bd3 -s ours
am skip reason: subject contains skip directive
Change-Id: I4c83a096d556894ace12a767de72ba62f6f3f587
2019-07-01 02:42:17 -07:00
TreeHugger Robot
eabf014bb3
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-07-01 09:35:06 +00: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
Change-Id: I599cabc0ec4f5d5661f74682e6fb6d73a21af71d
2019-06-30 18:57:28 -07:00
Pasty Chang
f76b39eb3c
Merge "Fix status bar color of a11y doesn't apply stencil" into qt-r1-dev
...
am: 2ba113898a
Change-Id: I247d6d369c41afb1e6fc5d14749877a2f2d8d2a1
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
042c1d5eb7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6d165ca5174555cba705f59a270f935cd6d52a6c
2019-06-30 16:21:10 -07: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
android-build-team Robot
a0f532daff
Snap for 5698755 from 9cd8167bff to qt-c2f2-release
...
Change-Id: I3c93ba7bed86abd2a0d5e0740af4a30d42f56770
2019-06-29 23:12:30 +00:00
android-build-team Robot
0ab6fbdb8f
Snap for 5698743 from 72aded338a to qt-release
...
Change-Id: I7b33e1bba4dcfcd626adbc27eb40d4fc95e3af6b
2019-06-29 23:05:08 +00:00
tmfang
ef24931fd8
Merge "Add summary for white balance feature" into qt-r1-dev
...
am: 9cd8167bff
Change-Id: Ifbaf043712bc0bb46d1ce8e8338e6da34ddf06cb
2019-06-29 04:41:31 -07:00
tmfang
ac2bad7203
Merge "Add summary for white balance feature" into qt-r1-dev
...
am: 9cd8167bff
Change-Id: Id3d86efde3f1335f1f978f0f4d1339e7cd1461ab
2019-06-29 04:41:29 -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
Change-Id: I68de93372d8350b3538bcdf86ee811ce846d9a3a
2019-06-28 14:55:07 -07:00
Yanting Yang
925f5929de
Fix RTL issue of Deferred Setup card
...
am: f6972b29b1
Change-Id: Idf00d35429f6fed5250fdf6b8a4de962638ad976
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
Change-Id: I6561e5313a24b076e947f2ed875097883684f001
2019-06-28 14:54:28 -07:00
Evan Severson
e7f084deb2
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
...
am: f461d8dc52
Change-Id: Id8374e6c7f1a3b7bce7e04d01ae1d0e8e61e6c1d
2019-06-28 14:54:07 -07:00
Joel Galenson
9aa82c09fe
Remove Permissions Hub. DO NOT MERGE
...
am: 69d9899868
Change-Id: I672b8c4f4184a0a2b96a0a7320103ef1754ff54e
2019-06-28 14:54:06 -07:00
Amin Shaikh
3e484def2f
Update Settings overlayed icons.
...
am: c477507f4e
Change-Id: Ia3ac06b30d829a14891c0811a89869640ccd225c
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
Change-Id: I7e3ce8019cc4a411dec6ebf72b8518e1026ed73d
2019-06-28 10:47:58 -07:00
Andrew Sapperstein
bf29d2fce6
Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a
...
am: 647f685063
Change-Id: I2e1f86871882063de4b4627e80c9327d2338b4e7
2019-06-28 10:43:13 -07:00
Andrew Sapperstein
647f685063
Merge "Add UI for mainline modules licenses." into qt-dev
...
am: 72aded338a
Change-Id: I93faf2c99489405fe82a75adf24f4d885bbe1558
2019-06-28 10:32:22 -07:00
Andrew Sapperstein
0c1f7da25a
Merge "Add UI for mainline modules licenses." into qt-dev
...
am: 72aded338a
Change-Id: I4a2b655f0a325194ec5aa242edaaf51095748bd7
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
f1c2bf8c33
Fix RTL issue of Deferred Setup card
...
am: f6972b29b1
Change-Id: Ib90d60e14dce7a3bafec01170994485752dd632c
2019-06-28 07:34:11 -07:00
android-build-team Robot
0783aef666
Snap for 5694913 from 8d08713c96 to qt-c2f2-release
...
Change-Id: I3a22e7cdb16986099fa63ba0583deced159eecf3
2019-06-28 04:09:47 +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
010183bdcd
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
...
am: 8d08713c96
Change-Id: I565145cdcb2344737e2455ce819e831aefa8798f
2019-06-27 16:44:58 -07:00
Winson Chung
27424848e8
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev am: 9591c3f963
...
am: 8bf207bab6
Change-Id: I6461b114459160029df2caf8bfe86ad761cfd9be
2019-06-27 16:37:13 -07:00
Winson Chung
8bf207bab6
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
...
am: 9591c3f963
Change-Id: Ie07033339ce3ed1ee57d5ab68e56b9a51135ac77
2019-06-27 16:24:53 -07:00
Winson Chung
8d08713c96
Merge "Adding unique task affinity for FallbackHome activity" into qt-dev
...
am: 9591c3f963
Change-Id: I45e8c0e6e3caa9551646c0d26eac1a78a2fa56cd
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