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
Change-Id: Ic986b24afbc15490f7d0faea8c7f23a979fdea4d
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
Change-Id: I9aa9be5d62060870b967e81a3e1148375d2a7d35
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
Change-Id: Icf8db899a7e0f68082e6eaf61f3f1541d456d880
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
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
Bill Yi
ea0d036439
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b53bebe6ec
-s ours
...
am: 7b4a46a156
-s ours
am skip reason: subject contains skip directive
Change-Id: I97418b13fcda83cb59e61c76c772421c3321e2ec
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
-s ours
am skip reason: subject contains skip directive
Change-Id: Ia34ac14e80f63c468a78e116bfcfe07c296c5411
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I86cc2b036103955954182d5d5161494945250602
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
-s ours
am skip reason: subject contains skip directive
Change-Id: I141d4034f665facf8dd8948abef49d17f7c05948
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
-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
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
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
Fan Zhang
aa08a2cc0e
Use slice uri from slice index db directly.
...
During SettingsSliceProvider#onGetSliceDescendants, use the uris from
database directly instead of getting the key and construct the uris
manually.
Bug: 126222433
Test: robotest
Change-Id: Iad4e9fc28ec4442b6bb323878503d743582b35ac
2019-05-31 16:03:33 -07:00
Joel Galenson
9e05bf902a
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev am: 4a9055a99c
...
am: efbf351167
Change-Id: Ib2dd0082d7b4b8d4d38fd6b3fdaa1c43eb94a69a
2019-05-31 15:34:06 -07:00
Joel Galenson
efbf351167
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
Change-Id: I90215bb8b92b6a5288647891bf5042e5a5802486
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
Change-Id: I723e084c30111c83ee98f6202b5f4478a1099d38
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
Change-Id: I7f2cb9c2ee20cfb32303c29e649dd327563db529
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
Change-Id: I90f792dd3f24533411deafd15988b70278a7fd27
2019-05-31 14:43:50 -07:00
Mehdi Alizadeh
ecf3028123
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: c4be5512a7
Change-Id: I61477938f506b07ce01ad8d3b6214fb38df1936a
2019-05-31 14:34:09 -07:00
Mehdi Alizadeh
9b378dd381
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
2019-05-31 14:30:18 -07:00
Mehdi Alizadeh
c4be5512a7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
2019-05-31 14:26:04 -07:00
Mehdi Alizadeh
cad67cdc0a
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488
Disables the Gesture nav option if 3P launcher is default
...
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.
Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
2019-05-31 12:26:28 -07:00
Julia Reynolds
b76a4911e6
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
am: 2c47160eff
...
am: b362588949
Change-Id: I092fe40a705cd17a6a2648e1dfc749c220d01801
2019-05-31 11:17:48 -07:00
Lei Yu
4d07c5bc94
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
am: 677d5a5e01
...
am: 4ffd4f09e7
Change-Id: Ie5f0581cad536a08d557aa29c455a2fce8ab34e0
2019-05-31 11:15:55 -07:00
Julia Reynolds
0b0763ce2e
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
am: c816aa26bd
...
am: 7b3315797d
Change-Id: I93b95f8096ad0af84a9368c357776c0c1ca7ce17
2019-05-31 11:13:40 -07:00
Lei Yu
09c60c349f
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
am: fad8cec592
...
am: a22bf1cd8b
Change-Id: Iaadee52c55098da5941dab5edfa1087dac7822c3
2019-05-31 11:10:26 -07:00
TreeHugger Robot
75a5ef8c16
Merge "Override 2 getSliceUri() instance to return platform slice"
2019-05-31 18:03:44 +00:00
Julia Reynolds
b362588949
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
...
am: 2c47160eff
Change-Id: Iaa78037289c2f2d6fcf93030b00b5d350d0552ec
2019-05-31 11:00:27 -07:00
Lei Yu
4ffd4f09e7
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: 677d5a5e01
Change-Id: I9f194a6e97a0f23cc4cd81ae328207c66cfd9831
2019-05-31 10:59:46 -07:00
Julia Reynolds
7b3315797d
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
...
am: c816aa26bd
Change-Id: I9fa208f11caffaa9e278d2ba22bee1d6ae3decae
2019-05-31 10:56:38 -07:00
Lei Yu
a22bf1cd8b
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: fad8cec592
Change-Id: I9b4a73685b8091760f375b58ad58d501046386d9
2019-05-31 10:53:59 -07:00
Raff Tsai
50ec2c218e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f
)
2019-05-31 17:51:00 +00:00
Raff Tsai
5d9328571e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f
)
2019-05-31 17:50:17 +00:00
Julia Reynolds
c816aa26bd
Merge "Update notification settings animation" into qt-dev
...
am: 1746ccca94
Change-Id: If2fe2025fcdcecd6a432a76b4eac4545249b39dc
2019-05-31 10:42:17 -07:00
Lei Yu
fad8cec592
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
2019-05-31 10:41:54 -07:00