Commit Graph

55804 Commits

Author SHA1 Message Date
Alan Stokes
c912a02f50 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
am: dd1545b098

Change-Id: Iffc9d8bfa0469af6895496c4be8a4c45535c71f5
2019-06-04 07:43:00 -07:00
Alan Stokes
393f4bbee3 Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
am: 5b09f510e2

Change-Id: Ie9d15780a3e92c539b78960dc92b8be68ef8813d
2019-06-04 07:42:53 -07:00
Alan Stokes
5b09f510e2 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
2019-06-04 07:38:04 -07:00
Alan Stokes
dd1545b098 Merge "Cleanup background activity starts for release." into qt-dev
am: c53f5ecb3d

Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96
2019-06-04 07:38:00 -07:00
Alan Stokes
c53f5ecb3d Merge "Cleanup background activity starts for release." into qt-dev 2019-06-04 14:26:29 +00:00
android-build-team Robot
d3c213d6f0 Snap for 5631427 from c9fbd2ee50 to qt-release
Change-Id: I866c90f3f61168effc011f7b43403a2a6a1af144
2019-06-04 03:05:30 +00:00
android-build-team Robot
824190eb18 Snap for 5631559 from a448cb9d07 to qt-qpr1-release
Change-Id: Ia635ce17c9044041a321a65eb895bf7a3049922a
2019-06-04 03:05:00 +00:00
android-build-team Robot
148f0e11d9 Snap for 5631102 from a448cb9d07 to qt-c2f2-release
Change-Id: I09b7506b09feab609b4e8f6fa54d2cfdf1f28ac5
2019-06-04 03:01:39 +00:00
Kevin Chang
515edfc5d8 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
am: 267321cd81

Change-Id: I149734cb5f9cdbf1834132b7bb32adb1e30f4b78
2019-06-03 18:52:01 -07:00
Kevin Chang
d20fa646fc Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
am: 267321cd81

Change-Id: Ibdf664068eb0f05b2c04b2399890904785e6e309
2019-06-03 18:51:57 -07:00
Antony Sargent
39a842b84a Add a "data during calls" preference am: aeb1da0db9
am: bffd3757e0

Change-Id: Ib3e766fe79f8db50ddcf56aac60935d128b3f52a
2019-06-03 18:49:44 -07:00
Antony Sargent
9d58d9a704 Add a "data during calls" preference am: aeb1da0db9
am: bffd3757e0

Change-Id: I5cf07a8942efcdba49808deb294cee5a7e614c2a
2019-06-03 18:49:41 -07:00
Kevin Chang
487a0c2a57 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
am: d2fa1e6baa

Change-Id: Id64aadc20751d107c93b32a420d679aa2cc9a72b
2019-06-03 18:48:20 -07:00
Antony Sargent
7a48cb470b Add a "data during calls" preference am: aeb1da0db9
am: 7f7f7cda18

Change-Id: Iaafabc24ace39911ab3198cd705311595832cb5d
2019-06-03 18:47:56 -07:00
Kevin Chang
267321cd81 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am: 68aa4e4919

Change-Id: I7db65e3ef0ed83e91a666a479cdbe8020aee763c
2019-06-03 18:42:10 -07:00
Kevin Chang
d2fa1e6baa Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am: 68aa4e4919

Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
2019-06-03 18:41:08 -07:00
Antony Sargent
bffd3757e0 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
2019-06-03 18:39:54 -07:00
Antony Sargent
7f7f7cda18 Add a "data during calls" preference
am: aeb1da0db9

Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
2019-06-03 18:39:19 -07:00
Kevin Chang
68aa4e4919 Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev 2019-06-04 01:29:21 +00:00
Lucas Dupin
64dad09e02 Merge "Longer character limit" into qt-r1-dev
am: a448cb9d07

Change-Id: I18b0e68a7a0a7842e07f3c4cf067906ec1dc4763
2019-06-03 16:04:59 -07:00
Lucas Dupin
d03a9828b9 Merge "Longer character limit" into qt-r1-dev
am: a448cb9d07

Change-Id: Id19c3ab0ee93e06ed362dbd8fc64caf6ed804c58
2019-06-03 15:58:55 -07:00
TreeHugger Robot
a448cb9d07 Merge "Longer character limit" into qt-r1-dev 2019-06-03 22:45:08 +00:00
Antony Sargent
aeb1da0db9 Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.

Bug: 132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
2019-06-03 15:20:33 -07:00
Lucas Dupin
4e7dd01d0e Longer character limit
Fixes: 134370077
Fixes: 134162233
Test: make
Change-Id: I3f697a093752faca37c4dc165857c97a6b1e410c
2019-06-03 11:33:50 -07:00
Lei Yu
f770bf78f5 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 7f8a269a3a

Change-Id: I17f3bdd7d8e5c7e81cd3499770f907bad9dee532
2019-06-03 10:54:34 -07:00
Lei Yu
b0acf3e230 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 7f8a269a3a

Change-Id: I9aa9be5d62060870b967e81a3e1148375d2a7d35
2019-06-03 10:25:29 -07:00
Lei Yu
1fa5118618 Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
am: 057dc8466a

Change-Id: If66ff93e4f4caddd9ebe62f9409812d4ed480c9b
2019-06-03 10:08:14 -07:00
Lei Yu
7f8a269a3a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
2019-06-03 10:06:14 -07:00
Lei Yu
057dc8466a Merge "Use new API to build NetworkTemplate" into qt-dev
am: c9fbd2ee50

Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
2019-06-03 10:03:30 -07:00
Lei Yu
c9fbd2ee50 Merge "Use new API to build NetworkTemplate" into qt-dev 2019-06-03 16:54:29 +00:00
Kevin Chang
ba2bdbc93a Update the string of both magnification settings and gesture navigation tutorial dialog
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0

Bug: 133336814
Bug: 133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
2019-06-03 21:55:42 +08:00
android-build-team Robot
a7624a8cb9 Snap for 5627702 from b53bebe6ec to qt-qpr1-release
Change-Id: Iedf3c932482a7cf7db3e639cbf380f95ba1a28af
2019-06-02 23:09:24 +00:00
android-build-team Robot
611f77ef7b Snap for 5627702 from b53bebe6ec to qt-c2f2-release
Change-Id: Icceef4085d1dd7f79b359b819cd7b796dd685c21
2019-06-02 23:09:22 +00:00
Bill Yi
7b4a46a156 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: b53bebe6ec -s ours
am skip reason: subject contains skip directive

Change-Id: Ia34ac14e80f63c468a78e116bfcfe07c296c5411
2019-06-02 00:36:26 -07:00
Bill Yi
712c90abe1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: b53bebe6ec -s ours
am skip reason: subject contains skip directive

Change-Id: I99943324fe056c8c53b645a2cd67e31e141c2ed9
2019-06-02 00:36:24 -07:00
TreeHugger Robot
907f2239bc Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-06-02 07:34:37 +00:00
TreeHugger Robot
b53bebe6ec Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-02 07:27:07 +00:00
android-build-team Robot
fd6ef908bb Snap for 5626642 from 5540373d4f to qt-c2f2-release
Change-Id: I84e72386d849bd337799cb85a4d464ba0e2d2c1d
2019-06-01 23:16:56 +00:00
android-build-team Robot
12508aa776 Snap for 5626731 from 2407b65709 to qt-release
Change-Id: I8f10ee0b0307882ca5c79dea97fecd736ebc43a3
2019-06-01 23:12:09 +00:00
android-build-team Robot
88dc42fe68 Snap for 5626839 from 5540373d4f to qt-qpr1-release
Change-Id: Id7de678fc0df7858766ebba5d06691bcd8bdb1b2
2019-06-01 23:08:40 +00:00
Android Build Merger (Role)
8d32123425 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours am: 5540373d4f -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-01 18:41:21 +00:00
Bill Yi
8f87b4534d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
am: 5540373d4f -s ours
am skip reason: subject contains skip directive

Change-Id: If1b222dbfc8f93199a1fe15e42e5ac6673224ab2
2019-06-01 11:41:04 -07:00
Bill Yi
884f7c7370 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
am: 59faf30c59 -s ours
am skip reason: subject contains skip directive

Change-Id: I62f652fbe6ee76b768d8bacdcd1b51b5213ab53e
2019-06-01 11:41:03 -07:00
Bill Yi
4083bbbefc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
am: 5540373d4f -s ours
am skip reason: subject contains skip directive

Change-Id: If4c6db6757c44625ab4fa460201cc2aea6f90a52
2019-06-01 11:41:02 -07:00
Bill Yi
59faf30c59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 2407b65709 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd7efb56a6182a5374a0ce6cf5ea5114d98532ac
2019-06-01 11:36:05 -07:00
Bill Yi
5540373d4f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 2407b65709 -s ours
am skip reason: subject contains skip directive

Change-Id: I9ea5834b80b4ad5a6cf17c58186010acc11e85b4
2019-06-01 11:36:05 -07:00
TreeHugger Robot
2407b65709 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-01 18:17:35 +00:00
Bill Yi
c3f412e385 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6f9fce5b981349174e0ca9480a237d8f118a8333
2019-06-01 10:46:42 -07:00
Bill Yi
79bc6c08a1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9675532a8f4b1f551c8130e9243262a52cd8a3d2
2019-06-01 10:26:48 -07:00
Bill Yi
6f9e016e2d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
2019-06-01 10:06:36 -07:00