Jack He
dc9b879ef9
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am: 80c0656ca6
...
am: e34375b88c
2018-01-08 20:20:47 +00:00
Jack He
7d563bd1de
Bluetooth: Use "Disable" in-band ringing instead of "Enable"
...
* Given that in-band ringing is enabled by default on supported devices,
the corresponding development settings should be rephrased from
"Enable in-band ringing" to "Disable in-band ringing" to hint that it
is enabled by default
* This also gets rid of special logic to check that option in
initialization
* Add strings to reflect this change as well
Bug: 65383086
Test: make, try toggling the preference and verify whether in-band
ringing works or not
Change-Id: I29f91c7d12c725b12452ec163b75051ff28f500d
Merged-In: I29f91c7d12c725b12452ec163b75051ff28f500d
2018-01-04 17:23:57 -08:00
Akiya Utsumi
9dffb28afd
Merge "Fix the format of wifi_carrier_content string" am: 985b432fc0
...
am: 47ba3b400c
2017-12-27 21:45:58 +00:00
Akiya Utsumi
28fcc97d1b
Fix the format of wifi_carrier_content string
...
Carrier name is not displayed on the dialog due to the
incorrect format "%1%s". This should be "%1$s".
Test: String change, manually verified
Bug: 70814622
Change-Id: Ie30b8d1eb85d390e4023e0a251e1f1c7fa6deec0
2017-12-22 05:38:12 +00: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
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
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
7bae205499
Settings: Remove HAL HDR+ option
...
Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
2017-12-01 08:11:56 -08: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
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
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
Bruno Martins
440373dbde
Merge "Settings: Add notification channel for SIM selection" am: c543d5ba26
...
am: 7431ad3a80
2017-11-15 21:56:18 +00:00
Bruno Martins
7431ad3a80
Merge "Settings: Add notification channel for SIM selection"
...
am: c543d5ba26
2017-11-15 21:54:16 +00: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
Bruno Martins
4c7070241a
Settings: Add notification channel for SIM selection
...
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
2017-11-14 22:28:59 +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
Xin Li
0599c79cf7
Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from
...
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
2017-11-13 15:18:37 -08:00
songkailun
46644059a5
Merge "translate array in res/values-ar" am: 0df2c8fbb7
...
am: 834025ef19
2017-11-09 20:59:59 +00:00
songkailun
fb1440952b
translate array in res/values-ar
...
"None" should be translated
Change-Id: I9cd1b21947834a070ba66a7ee7641d0b6617de52
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-11-07 11:51:02 +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
Erik Kline
3194e6cbb8
Merge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b
...
am: 768f467089
2017-11-07 06:08:59 +00:00
Erik Kline
1ea5dd05c3
Replace dns_tls with private_dns_mode setting
...
Also includes:
- new layout fragment for private DNS configuration
- PrivateDnsModeDialogPreference handler class
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual interaction with private dns developer option works
Bug: 34953048
Bug: 6413396
Change-Id: I3a5490c21f7f3b3e523a247c287f213d19b75a8b
2017-11-07 12:28:48 +09:00
Malcolm Chen
bd124449c0
Updates strings for "Emergency broadcast".
...
Replace "Emergency broadcast" with "Emergency alerts" to be
consistent.
Test: manual
Bug: b/62291344
Change-Id: I79d6f1162d4c112dedf49a3b43ec26011adba9bf
2017-11-01 16:49:36 -07:00
Bill Yi
97eec4be9f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: If1e768b33481061f37bac9612b862ece348f15fb
2017-10-30 18:16:54 -07:00
Bill Yi
e2dbd96742
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Idb8eeaa4ee52a3d250c95a164a7bf28512d32901
2017-10-30 18:12:54 -07:00
Bill Yi
198f1320b7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I17237599107b5576cfc9261b866614c1a69fb531
2017-10-28 23:21:49 -07:00
Bill Yi
09bd03ba04
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98
2017-10-26 21:16:36 -07:00
Bill Yi
99826ce0ab
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I35ac0b6a330fb71bc2aa0020ae8417664345e213
2017-10-26 21:10:31 -07:00
Fan Zhang
a12b3d318d
Add strings to support multi-state vivid color management
...
Bug: 68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit e1543a3895
2017-10-26 10:10:46 -07:00
Bill Yi
68d7f87f78
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
2017-10-26 10:10:45 -07:00
Romain Guy
9143fb26b4
Add new color mode setting
...
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug: 68159303
Test: make RunSettingsRoboTests
Merged-In: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit 05fa18f847
2017-10-26 10:09:34 -07:00
