Alan Stokes
dd1545b098
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
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
tmfang
675bc1940b
Ignore failure test case
...
Test: atest BatteryTipDialogFragmentTest
Bug: 134451831
Change-Id: I5649cbcf0d585514651c5b6befcca271e85a3cb3
2019-06-04 17:33:51 +08:00
Kevin Chang
29e482e236
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: 267321cd81
...
am: d20fa646fc
2019-06-03 19:02:25 -07:00
Antony Sargent
03ce225c95
Add a "data during calls" preference am: aeb1da0db9 am: bffd3757e0
...
am: 39a842b84a
2019-06-03 19:01:53 -07:00
Kevin Chang
99735a39f7
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: d2fa1e6baa
...
am: 487a0c2a57
2019-06-03 19:01:29 -07:00
Antony Sargent
5217f29671
Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
...
am: 7a48cb470b
2019-06-03 19:00:57 -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
2019-06-03 18:51:57 -07:00
Antony Sargent
39a842b84a
Add a "data during calls" preference am: aeb1da0db9
...
am: bffd3757e0
2019-06-03 18:49:44 -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
2019-06-03 18:48:20 -07:00
Antony Sargent
7a48cb470b
Add a "data during calls" preference am: aeb1da0db9
...
am: 7f7f7cda18
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
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
2019-06-03 18:41:08 -07:00
Antony Sargent
bffd3757e0
Add a "data during calls" preference
...
am: aeb1da0db9
2019-06-03 18:39:54 -07:00
Antony Sargent
7f7f7cda18
Add a "data during calls" preference
...
am: aeb1da0db9
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
a1e19f1349
Merge "Longer character limit" into qt-r1-dev am: a448cb9d07
...
am: 64dad09e02
2019-06-03 16:12:24 -07:00
Lucas Dupin
64dad09e02
Merge "Longer character limit" into qt-r1-dev
...
am: a448cb9d07
2019-06-03 16:04:59 -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
8e94a0fd3f
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 7f8a269a3a
...
am: b0acf3e230
2019-06-03 10:35:58 -07:00
Lei Yu
b0acf3e230
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
...
am: 7f8a269a3a
2019-06-03 10:25:29 -07:00
Lei Yu
68c81d5b79
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50 am: 057dc8466a
...
am: 1fa5118618
2019-06-03 10:15:47 -07:00
Lei Yu
1fa5118618
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
...
am: 057dc8466a
2019-06-03 10:08:14 -07:00
Lei Yu
7f8a269a3a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
2019-06-03 10:06:14 -07:00
Lei Yu
057dc8466a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
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
Bill Yi
ea0d036439
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b53bebe6ec -s ours
...
am: 7b4a46a156
2019-06-02 00:41:26 -07:00
Bill Yi
7b4a46a156
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: b53bebe6ec
2019-06-02 00:36:26 -07:00
TreeHugger Robot
b53bebe6ec
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-02 07:27:07 +00:00
TreeHugger Robot
7ffb045941
Merge "Import translations. DO NOT MERGE"
2019-06-01 20:30:35 +00:00
Bill Yi
60eace544d
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours am: 5540373d4f -s ours
...
am: 8d32123425
2019-06-01 11:46:27 -07:00
Bill Yi
1770803f74
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours am: 59faf30c59 -s ours
...
am: 884f7c7370
2019-06-01 11:45:52 -07: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
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
2019-06-01 11:41:03 -07:00
Bill Yi
59faf30c59
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 2407b65709
2019-06-01 11:36:05 -07:00
Bill Yi
5540373d4f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 2407b65709
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
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
Bill Yi
0d0a5745a1
Import translations. DO NOT MERGE
...
Change-Id: I987c1a38cc9f9d40530615dad01e6757312cc133
Auto-generated-cl: translation import
2019-06-01 09:46:42 -07:00
Joel Galenson
9e05bf902a
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev am: 4a9055a99c
...
am: efbf351167
2019-05-31 15:34:06 -07:00
Joel Galenson
efbf351167
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
2019-05-31 15:04:56 -07:00
Mehdi Alizadeh
34a615bc57
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: 9b378dd381
...
am: 860d96d676
2019-05-31 15:04:37 -07:00
TreeHugger Robot
4a9055a99c
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
2019-05-31 21:54:29 +00:00
Mehdi Alizadeh
860d96d676
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: 9b378dd381
2019-05-31 14:46:58 -07:00
Mehdi Alizadeh
793cb2c9c7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: c4be5512a7
...
am: ecf3028123
2019-05-31 14:43:50 -07:00
