Android Build Merger (Role)
ad44ea442b
Merge "Import translations. DO NOT MERGE am: 1d6d60f251 -s ours" into oc-mr1-dev
2017-12-13 13:19:40 +00:00
Bill Yi
ae0da91c1c
Import translations. DO NOT MERGE
...
am: 1d6d60f251
2017-12-13 13:19:06 +00:00
Bill Yi
1d6d60f251
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If249fffda6df063fd39ec95e4ba04b412a1ea9e1
2017-12-12 16:25:18 -08:00
Bill Yi
e30af484ff
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093
2017-12-12 16:19:14 -08:00
TreeHugger Robot
15b42b89b8
Merge "Update the way OMS records details about overlays" into oc-mr1-dev
2017-12-12 21:48:17 +00:00
TreeHugger Robot
814fb3b7a1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-12-08 05:52:37 +00:00
Bill Yi
14c47203b3
Import translations. DO NOT MERGE
...
am: 3ed385256a
2017-12-08 05:39:41 +00:00
Bill Yi
3ed385256a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
2017-12-07 17:08:40 -08:00
Bill Yi
3ea52be26d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I59dde21252b7681bb6dfcf9dae1f27192a3cd19e
2017-12-07 17:08:11 -08:00
TreeHugger Robot
afa1efabad
Merge "Update asset for no search result image" into oc-mr1-dev
2017-12-08 00:19:09 +00:00
Adam Lesinski
9e19121a00
Update the way OMS records details about overlays
...
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.
Bug: 69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
2017-12-07 19:40:19 +00:00
Antony Sargent
51950965e9
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9 am: 26e5f828f7
...
am: fe20f69e3f
2017-12-05 23:17:11 +00:00
Antony Sargent
fe20f69e3f
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1 am: db6e747ab9
...
am: 26e5f828f7
2017-12-05 23:10:05 +00:00
Antony Sargent
26e5f828f7
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85 am: acacd658f1
...
am: db6e747ab9
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407 am: 9867a3ef85
...
am: acacd658f1
2017-12-05 17:32:41 +00:00
Antony Sargent
acacd658f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207 am: 3d7dbd6407
...
am: 9867a3ef85
2017-12-05 17:28:54 +00:00
Antony Sargent
9867a3ef85
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1 am: 24f063a207
...
am: 3d7dbd6407
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846 am: 9cf1fc73f1
...
am: 24f063a207
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3 am: eee62e1846
...
am: 9cf1fc73f1
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1
Reword bluetooth confirmation dialog am: e14d38a383 am: b2b401b5f3
...
am: eee62e1846
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846
Reword bluetooth confirmation dialog am: e14d38a383
...
am: b2b401b5f3
2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3
Reword bluetooth confirmation dialog
...
am: e14d38a383
2017-12-05 17:13:36 +00:00
TreeHugger Robot
fa3af7b0e7
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
...
* changes:
Settings: Remove HAL HDR+ option
Revert "Revert "Settings: Enable HAL HDR+ by default""
2017-12-03 03:20:19 +00:00
Antony Sargent
4b47184df3
Fix BluetoothPairingDialogTest to not expect device name am: f20e0a492b
...
am: 0ceadf9fb8
2017-12-01 21:23:59 +00:00
Antony Sargent
0ceadf9fb8
Fix BluetoothPairingDialogTest to not expect device name
...
am: f20e0a492b
2017-12-01 21:21:38 +00:00
Chien-Yu Chen
7bae205499
Settings: Remove HAL HDR+ option
...
Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
2017-12-01 08:11:56 -08:00
Chien-Yu Chen
24721e7d96
Revert "Revert "Settings: Enable HAL HDR+ by default""
...
This reverts commit 781e762c2c
2017-12-01 08:11:44 -08:00
Fan Zhang
8fe9c25e35
Update asset for no search result image
...
Bug: 68863351
Test: visual
Change-Id: Ia4d411e5d7d1db8b321fdfde006a93c6ff52ecb3
(cherry picked from commit cb721bd870
2017-11-30 00:36:14 +00:00
TreeHugger Robot
419407eaea
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-26 23:02:14 +00:00
Bill Yi
b2cc06ea43
Import translations. DO NOT MERGE
...
am: 9ae05458f0
2017-11-26 22:49:49 +00:00
Bill Yi
9ae05458f0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02
2017-11-26 12:19:05 -08:00
Bill Yi
f00a457d5b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ibfb674f157b342ea77c07cd88c47dc25b2fcd03e
2017-11-26 12:15:58 -08:00
TreeHugger Robot
59a800d0ec
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-20 22:46:59 +00:00
Bill Yi
9a7789a0fc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: ae351b3266
2017-11-20 22:31:36 +00:00
TreeHugger Robot
ae351b3266
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-11-20 22:20:05 +00:00
Bill Yi
d4bae3a7a0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264
2017-11-20 11:40:38 -08:00
Bill Yi
c47fc92b8c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1
2017-11-20 11:39:36 -08:00
Antony Sargent
e14d38a383
Reword bluetooth confirmation dialog
...
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug: 62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
2017-11-15 18:38:43 +00:00
Antony Sargent
f20e0a492b
Fix BluetoothPairingDialogTest to not expect device name
...
The functional fix for b/62672248 in ag/2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug: 62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
2017-11-15 18:38:36 +00:00
Bill Yi
8b334cb99a
Import translations. DO NOT MERGE
...
am: fbdea47c44
2017-11-15 03:37:20 +00:00
Bill Yi
fbdea47c44
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241
2017-11-14 12:42:27 -08:00
Bill Yi
cc5fd487eb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic67e156508ed64a3ae1f26c095f72929f29e9b63
2017-11-14 12:38:18 -08:00
Ningyuan Wang
6c12f06bf8
Enforce null check for mAccessPoint
...
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.
Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f4
2017-11-08 18:24:48 +00:00
TreeHugger Robot
7b75c5a338
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-07 09:41:30 +00:00
Bill Yi
f74efef4fb
Import translations. DO NOT MERGE
...
am: 73120a4cdb
2017-11-07 09:33:26 +00:00
Bill Yi
73120a4cdb
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
2017-11-06 23:21:01 -08:00
Bill Yi
80f3654189
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180
2017-11-06 23:20:38 -08:00
Fan Zhang
fbc2fd065c
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours am: ef61a45cf6 -s ours
...
am: 5af580a419
2017-11-03 00:42:12 +00:00
Fan Zhang
5af580a419
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours am: e981e0b855 -s ours
...
am: ef61a45cf6
2017-11-03 00:40:07 +00:00
Fan Zhang
ef61a45cf6
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am: 1c040c7414 -s ours am: b17703e871 -s ours am: 1de093b1a1 -s ours am: 5f02135c42 -s ours am: 7690482014 -s ours am: dbbcf65c96 -s ours am: e6a8f354fc -s ours am: 3c19043e9c -s ours am: d15a81f882 -s ours
...
am: e981e0b855
2017-11-03 00:38:04 +00:00
