tmfang
675bc1940b
Ignore failure test case
...
Test: atest BatteryTipDialogFragmentTest
Bug: 134451831
Change-Id: I5649cbcf0d585514651c5b6befcca271e85a3cb3
2019-06-04 17:33:51 +08:00
Sunny Shao
2c6d308ecb
Set the mAccountName as null while device has no any account
...
It doesn't clean the mAccountName buffer while device has no any account. And it will be put into
the Intent and pass to MeCard when user click the ghost boy avatar. It does not make sense and
modify code to fixed it.
Fixes: 129265427
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.accounts
make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.core
make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.dashboard
Change-Id: Ib8cfab2cb416515018f335b21ef49a95699a1597
2019-06-04 15:56:18 +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
Change-Id: I2ba78f260e539bee65f3e2a9aae42229f8573dc4
2019-06-03 19:02:25 -07:00
Antony Sargent
03ce225c95
Add a "data during calls" preference am: aeb1da0db9
am: bffd3757e0
...
am: 39a842b84a
Change-Id: I84c6a980b652d28276b2e1af9e46a7663d05931d
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
Change-Id: I0647c73de02299d00531be23aee066a3a078f992
2019-06-03 19:01:29 -07:00
Antony Sargent
5217f29671
Add a "data during calls" preference am: aeb1da0db9
am: 7f7f7cda18
...
am: 7a48cb470b
Change-Id: I8f9e97915fa3063d0a2f865ed749201fb404f5bc
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
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
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
a1e19f1349
Merge "Longer character limit" into qt-r1-dev am: a448cb9d07
...
am: 64dad09e02
Change-Id: I097a7cdffdbe10f2eea448a92da3b27e5205e522
2019-06-03 16:12:24 -07: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
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
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
Amin Shaikh
5d8b1b3cc5
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
2019-06-03 12:26:11 -04: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