Atanas Kirilov
5a996aa7fe
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours am: 71046c3d10 -s ours
...
am: bed0aff4a2
2018-06-04 18:17:44 -07:00
Atanas Kirilov
8006c6a726
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53
...
am: 128334d2c6
2018-06-04 17:47:54 -07:00
Atanas Kirilov
f97fc8eb17
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 am: 463ea747f6
...
am: 25bd78d7e9
2018-06-04 17:46:21 -07:00
Atanas Kirilov
dabefd5d43
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 am: 0d59c0d23d
...
am: a6b728c5a3
2018-06-04 17:41:57 -07:00
Atanas Kirilov
bed0aff4a2
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours
...
am: 71046c3d10
2018-06-04 17:41:55 -07:00
Atanas Kirilov
c114a65956
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 am: 2f38890832
...
am: 5dfb976b21
2018-06-04 17:31:09 -07:00
Atanas Kirilov
224968eebd
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c
...
am: f2a135ec5a
2018-06-04 17:18:51 -07:00
Atanas Kirilov
71046c3d10
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours
...
am: b072779789
2018-06-04 17:10:35 -07:00
Atanas Kirilov
b072779789
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
...
am: 8994d1f0a4
2018-06-04 16:59:14 -07:00
Atanas Kirilov
128334d2c6
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3
...
am: 5e66879b53
2018-06-04 16:46:48 -07:00
Atanas Kirilov
25bd78d7e9
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1
...
am: 463ea747f6
2018-06-04 16:45:39 -07:00
Atanas Kirilov
a6b728c5a3
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778
...
am: 0d59c0d23d
2018-06-04 16:42:39 -07:00
Atanas Kirilov
5dfb976b21
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9
...
am: 2f38890832
2018-06-04 16:41:45 -07:00
Atanas Kirilov
f2a135ec5a
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3
...
am: a50293f72c
2018-06-04 16:40:10 -07:00
Atanas Kirilov
5e66879b53
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4
...
am: dededea9f3
2018-06-04 16:14:11 -07:00
Atanas Kirilov
463ea747f6
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94
...
am: 67892acff1
2018-06-04 16:13:02 -07:00
Atanas Kirilov
0d59c0d23d
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52
...
am: a29108a778
2018-06-04 16:10:32 -07:00
Atanas Kirilov
2f38890832
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb
...
am: 65db9c47b9
2018-06-04 16:09:33 -07:00
Atanas Kirilov
a50293f72c
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e
...
am: 74d98110f3
2018-06-04 16:07:36 -07:00
Shuzhen Wang
7ed1343d0a
Merge "Revert "Settings: Add logical camera default switch"" into pi-dev
...
am: 1db4027355
2018-06-04 16:06:07 -07:00
Atanas Kirilov
dededea9f3
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
...
am: 9b4f5525b4
2018-06-04 15:43:14 -07:00
Atanas Kirilov
67892acff1
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
...
am: 75f0072c94
2018-06-04 15:41:42 -07:00
Atanas Kirilov
a29108a778
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
...
am: 438cf9da52
2018-06-04 15:39:29 -07:00
Atanas Kirilov
65db9c47b9
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
...
am: 9e626734bb
2018-06-04 15:38:17 -07:00
Atanas Kirilov
74d98110f3
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
...
am: 826b14e43e
2018-06-04 15:36:29 -07:00
TreeHugger Robot
1db4027355
Merge "Revert "Settings: Add logical camera default switch"" into pi-dev
2018-06-04 20:45:51 +00:00
Atanas Kirilov
8994d1f0a4
Merge "Merge translations of Bluetooth confirmation text" into oc-dev
2018-06-04 20:37:42 +00:00
Atanas Kirilov
9b4f5525b4
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
...
* changes:
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a108cb3edaab176eaa85ee20b700ac1a0b8f3fe3a108cb3edaab176eaa85ea0b8f3fe3a108cb3edaaa0b8f3fe3a
2018-06-04 20:25:15 +00:00
Atanas Kirilov
75f0072c94
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5ed423eadcf7304aaf293e9345782e2c874b450af7d505aefa5ed423eadcf7304aaf293e9345782e27d505aefa5ed423eadcf7304aaf2937d505aefa5ed423eadcf7d505aefa5
2018-06-04 20:24:37 +00:00
Atanas Kirilov
438cf9da52
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d
2018-06-04 20:24:34 +00:00
Atanas Kirilov
9e626734bb
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff714a82795313ba2ea1e53e2d1bae1bd88bc91c3b8b3e48235bf63f8d33ff714a82795313ba2ea1e53e2d1bae1bd88bc91c3b8b3f8d33ff714a82795313ba2ea1e53e2d1bae1bd83f8d33ff714a82795313ba2ea1e53e3f8d33ff714a827953133f8d33ff71
2018-06-04 20:24:25 +00:00
Atanas Kirilov
826b14e43e
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17e30d0145eadb9aa0fbfe9e0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17e30d0145eade0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17ee0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85fe0eeafcb5d5b4de5e724cb66517282874c51780fe0eeafcb5d5b4de5e724cb66517282e0eeafcb5d5b4de5e724e0eeafcb5d
2018-06-04 20:24:19 +00:00
Antony Sargent
ba8ae71025
Merge translations of Bluetooth confirmation text
...
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
Merged-In: I2d8c57680d1d98b74193654e9fe77016304f6ac5
2018-06-04 18:05:34 +00:00
Shuzhen Wang
8f9fc06a18
Revert "Settings: Add logical camera default switch"
...
This reverts commit a9578a2b8a
2018-06-04 17:37:25 +00:00
Android Build Merger (Role)
80381d7ff8
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1
...
Change-Id: Ib56a32b88c58c7b1a54ba4522cd9bf4bd80cd6e5
2018-06-04 17:23:18 +00:00
Android Build Merger (Role)
e20b700ac1
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e
...
Change-Id: Ib1f576348a4e89028ddb3d731ecdc1c92599723d
2018-06-04 17:23:16 +00:00
Android Build Merger (Role)
b176eaa85e
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
...
Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f
2018-06-04 17:23:08 +00:00
Bill Yi
170d5415bc
[automerger skipped] Import translations. DO NOT MERGE
...
am: d9bd267146
2018-06-04 10:12:58 -07:00
Bill Yi
d9bd267146
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I7d788703ce218cc211305bf078fde78ce7dde2af
2018-06-03 14:55:40 -07:00
Bill Yi
5236bf8780
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8c56825ecd
2018-06-01 11:19:28 -07:00
Bill Yi
8c56825ecd
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
2018-05-31 22:05:33 -07:00
Ryan Lin
15eb7fe8c4
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
...
am: 942b07da93
2018-05-31 17:16:12 -07:00
Ryan Lin
942b07da93
Merge "Handle Bluetooth is not supported on emulator" into pi-dev
2018-05-31 23:22:30 +00:00
Beverly
60d57976bc
Merge "No need for "and" - ListFormatter adds it" into pi-dev
...
am: fa01fcb2c9
2018-05-31 14:24:11 -07:00
Matthew Fritze
2c7fe6f8ea
Merge "Make Settings Slider Slices one row" into pi-dev
...
am: 4199198ec2
2018-05-31 11:37:19 -07:00
TreeHugger Robot
fa01fcb2c9
Merge "No need for "and" - ListFormatter adds it" into pi-dev
2018-05-31 18:12:00 +00:00
TreeHugger Robot
4199198ec2
Merge "Make Settings Slider Slices one row" into pi-dev
2018-05-31 16:03:25 +00:00
Beverly
ab5a016e26
No need for "and" - ListFormatter adds it
...
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
2018-05-31 09:32:26 -04:00
ryanywlin
d67314e771
Handle Bluetooth is not supported on emulator
...
- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor
Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42
Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e
2018-05-31 12:48:13 +08:00
Matthew Fritze
93307cdb69
Make Settings Slider Slices one row
...
To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.
Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests
2018-05-30 15:39:43 -07:00
