Bill Yi
9840c89235
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 814fb3b7a1
2017-12-08 06:01:46 +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
5811075aeb
Import translations. DO NOT MERGE am: 3ed385256a -s ours
...
am: 14c47203b3
2017-12-08 05:42:43 +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
Fan Zhang
ed6805142f
Merge "Update asset for no search result image" into oc-mr1-dev
...
am: afa1efabad
2017-12-08 00:25:31 +00:00
TreeHugger Robot
afa1efabad
Merge "Update asset for no search result image" into oc-mr1-dev
2017-12-08 00:19:09 +00:00
Xin Li
a038fb9044
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours
...
am: 4f83509810
2017-12-07 15:23:18 +00:00
Xin Li
4f83509810
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: cb1056f9b4
2017-12-07 15:17:25 +00:00
Xin Li
82c94efa69
DO NOT MERGE: Merge Oreo MR1 into master am: 7b017d5a2f -s ours
...
am: 2ba6a22abb
2017-12-07 07:05:14 +00:00
Xin Li
2ba6a22abb
DO NOT MERGE: Merge Oreo MR1 into master
...
am: 7b017d5a2f
2017-12-07 04:36:38 +00:00
Xin Li
cb1056f9b4
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:29 +00:00
Xin Li
7b017d5a2f
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
2017-12-06 14:24:54 -08:00
Antony Sargent
5f4e32ae5f
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
...
am: 51950965e9
2017-12-05 23:23:05 +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
Jordan Liu
d2b04e92fe
Merge "Hide signal strength when told by carrier" am: 9afa720abe
...
am: ed9508f3a6
2017-12-05 00:27:13 +00:00
Jordan Liu
ed9508f3a6
Merge "Hide signal strength when told by carrier"
...
am: 9afa720abe
2017-12-04 23:45:57 +00:00
Jordan Liu
9afa720abe
Merge "Hide signal strength when told by carrier"
2017-12-04 23:20:31 +00:00
Chien-Yu Chen
890c9a7ad3
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
...
am: fa3af7b0e7
2017-12-03 03:28:40 +00:00
Chien-Yu Chen
c8d91c6066
Revert "Revert "Settings: Enable HAL HDR+ by default""
...
am: 24721e7d96
2017-12-03 03:28:03 +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
a4e3b55ad2
Fix BluetoothPairingDialogTest to not expect device name am: f20e0a492b am: 0ceadf9fb8
...
am: 4b47184df3
2017-12-01 21:26:05 +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
Bill Yi
9bbae65730
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: ec4fe2a0c6
2017-11-30 23:01:17 +00:00
TreeHugger Robot
ec4fe2a0c6
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-11-30 20:59:07 +00:00
Hemant Gupta
cf2557e8f4
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE" am: b21a10b2ff
...
am: a84a535729
2017-11-30 17:43:08 +00:00
Hemant Gupta
a84a535729
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
...
am: b21a10b2ff
2017-11-30 17:40:31 +00:00
Treehugger Robot
b21a10b2ff
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
2017-11-30 17:38:01 +00:00
Bill Yi
e55bc2b591
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 69925163
Change-Id: I4c880093e20e7178ce80006b158fefd490b4e061
2017-11-30 04:05:41 -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
Hemant Gupta
5b84cfae44
Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE
...
Step by step:
1. Pair and connect with BTHS (e.g. SBH50).
2. Click the settings icon of paired device, and check "Use for" items.
-----------------------------------------------------------------
Expected Result:
After step 2, "Contact sharing" should not be checked.
Actual Result:
After step 2, "Contact sharing" is checked.
Fix:
Set phone book permission as REJECTED if class of Device is
not AUDIO_VIDEO_HANDSFREE
Test: Checked above usecase and issue is not observed
Bug: 64372703
Change-Id: I178a09dd9e76d67c461c4b04d9b2ee0078ed24c9
2017-11-29 20:37:05 +00:00
Patrik Bannura
5a84add99f
Hide signal strength when told by carrier
...
Bug: 69730732
Test: Add different values for two carriers in vendor.xml
and see them change when swapping sim card
Depends-On: I155c8f619a451edab85cf6422cef73e8e1686629
Change-Id: I241ddb3c20002db781308d94c6c165b8d13b2474
2017-11-29 12:18:49 +00:00
Malcolm Chen
68af33f2df
Merge "Remove extra newline in AndroidManifest." am: 8aeb69396d
...
am: 9d30592308
2017-11-29 00:36:54 +00:00
Malcolm Chen
9d30592308
Merge "Remove extra newline in AndroidManifest."
...
am: 8aeb69396d
2017-11-29 00:31:49 +00:00
Treehugger Robot
8aeb69396d
Merge "Remove extra newline in AndroidManifest."
2017-11-29 00:22:47 +00:00
Bill Yi
1ef2ec2264
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 419407eaea
2017-11-26 23:05:52 +00:00
