Bill Yi
e108107a92
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 246873db8e
-s ours
am skip reason: subject contains skip directive
Change-Id: I22be0cf868553d2728e0d3e407b1edb6c10e02b1
2019-07-03 16:30:18 -07:00
Kevin Chyn
15265e29d1
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
...
am: 47593cd29b
Change-Id: Icbde69859391ec8b3497c736d6812e30ddcd417d
2019-07-03 16:25:09 -07:00
Bill Yi
b038d65f4c
[automerger skipped] Import translations. DO NOT MERGE
...
am: a0fb9000bb
-s ours
am skip reason: subject contains skip directive
Change-Id: I6a45fa6f274773e72385e7e1f8356b7e7ad68995
2019-07-03 16:24:44 -07:00
Mark Chien
8a44e4f274
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
2019-07-03 13:16:03 +00:00
TreeHugger Robot
246873db8e
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-07-03 07:21:59 +00:00
Bill Yi
a0fb9000bb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6863ccbf2304c8bb2d7ee93b41386bff36e33a41
2019-07-02 23:30:20 -07:00
Bill Yi
0b2b3a0ded
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ea845510ab634d146f09f885ab0de8cd789c325
2019-07-02 19:46:11 -07:00
Kevin Chyn
47593cd29b
Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
2019-07-03 02:07:49 +00:00
TreeHugger Robot
0cfcec2031
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-07-02 00:17:22 +00:00
Bill Yi
8d7e46515b
[automerger skipped] Import translations. DO NOT MERGE
...
am: da20a84f9b
-s ours
am skip reason: subject contains skip directive
Change-Id: Id4b0bbaac5733f8ed1f9eb99acdb67efcb4ff624
2019-07-01 16:21:33 -07:00
Bill Yi
a8d8d638af
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I90c0ada933cdd3d4b2431efdfe8290d3479aeac7
2019-07-01 14:22:44 -07: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
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
TreeHugger Robot
0217400ea5
Merge "Update ic_sync_problem to GM2." into qt-r1-dev
2019-07-01 11:52:33 +00: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
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
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
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
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
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
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
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
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
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
Evan Severson
1be07892a1
Merge "Remove Permissions Hub. DO NOT MERGE" into qt-r1-dev
...
am: f461d8dc52
Change-Id: I4729bdde26d5953839a623cd9ea483a387a5d901
2019-06-27 14:32:34 -07:00
Joel Galenson
d308c09d49
Remove Permissions Hub. DO NOT MERGE
...
am: 69d9899868
Change-Id: Id79ab681beaad7aca73d6f234b739470b85e19cd
2019-06-27 14:32:33 -07: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
cec55e7c2d
Update Settings overlayed icons.
...
am: c477507f4e
Change-Id: I58e03056f7bd1f61b089c3fb60c17f8afc7a8488
2019-06-27 13:37:56 -07: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
)
This should have been submitted with ag/8109287
Bug: 136012133
Test: Clicked through permission screens on cuttlefish
Change-Id: I2663aa365baf78ccc6f0a3d585b09da0dd387970
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
788093f3c8
Merge "Fixed the IllegalStateException on removing account" into qt-dev am: 5a69fac694
...
am: bfffb2ae74
Change-Id: Iac5fbc9c5486a7ea4db51bfc2cccc10cd8cd37e0
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
Sunny Shao
bfffb2ae74
Merge "Fixed the IllegalStateException on removing account" into qt-dev
...
am: 5a69fac694
Change-Id: I085502786e8883c7ffb346592bfebc1a3bb08209
2019-06-26 04:35:26 -07:00