Alan Stokes
393f4bbee3
Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d
...
am: 5b09f510e2
2019-06-04 07:42:53 -07:00
Alan Stokes
5b09f510e2
Merge "Cleanup background activity starts for release." into qt-dev
...
am: c53f5ecb3d
2019-06-04 07:38:04 -07:00
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
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
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
148f0e11d9
Snap for 5631102 from a448cb9d07 to qt-c2f2-release
...
Change-Id: I09b7506b09feab609b4e8f6fa54d2cfdf1f28ac5
2019-06-04 03:01:39 +00: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
515edfc5d8
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919
...
am: 267321cd81
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
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
Antony Sargent
9d58d9a704
Add a "data during calls" preference am: aeb1da0db9
...
am: bffd3757e0
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
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
Lucas Dupin
d03a9828b9
Merge "Longer character limit" into qt-r1-dev
...
am: a448cb9d07
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
2019-06-03 10:54:34 -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
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
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
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
Bill Yi
712c90abe1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: b53bebe6ec
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
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
