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
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
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
TreeHugger Robot
419407eaea
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-26 23:02:14 +00:00
Bill Yi
97e5272958
Import translations. DO NOT MERGE am: 9ae05458f0 -s ours
...
am: b2cc06ea43
2017-11-26 22:52:50 +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
songkailun
04ec2de540
Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours
...
am: 94cd0e4373
2017-11-22 18:57:13 +00:00
songkailun
94cd0e4373
Merge "DO NOT MERGE translate arrays in Settings/res"
...
am: 992a4e5500
2017-11-22 18:49:59 +00:00
Treehugger Robot
992a4e5500
Merge "DO NOT MERGE translate arrays in Settings/res"
2017-11-22 18:36:14 +00:00
songkailun
d0fa1537cb
DO NOT MERGE translate arrays in Settings/res
...
"None" should be translated
Change-Id: I12a30e6476ec41c2a3bf1878d6b5596bf5ee8ed7
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-11-22 17:14:41 +00:00
Malcolm Chen
9b3b138074
Remove extra newline in AndroidManifest.
...
Remove extra newline in AndroidManifest which caused
android.settings.MOBILE_DATA_USAGE not received.
Bug: b/63670955
Test: testcase MobileDataUsageActivityTest
Change-Id: I4a4178141010b128e3d9c8c9721a51b81cbdffff
2017-11-21 12:15:02 -08:00
jackqdyulei
dc75d02b95
Merge "Add owners to setting packages." am: f82cd59476
...
am: e6f052e928
2017-11-21 16:46:24 +00:00
jackqdyulei
e6f052e928
Merge "Add owners to setting packages."
...
am: f82cd59476
2017-11-21 16:41:50 +00:00
Treehugger Robot
f82cd59476
Merge "Add owners to setting packages."
2017-11-21 16:35:30 +00:00
Malcolm Chen
df0a4bbcd3
Merge "Add an activity that starts DataUsageList fragment for mobile." am: 942d418da9 -s ours
...
am: 5b59b71f12
2017-11-21 00:58:56 +00:00
Malcolm Chen
5b59b71f12
Merge "Add an activity that starts DataUsageList fragment for mobile."
...
am: 942d418da9
2017-11-21 00:48:50 +00:00
jackqdyulei
d6a00cfa3f
Add owners to setting packages.
...
Bug: 65294119
Fixes: 69384604
Test: Build
Change-Id: Ib4fddc1f04087671d8445fd967d4262287e5c4f3
Merged-In: I927052a73f639d0894600611cd5c79293f43ff5e
Merged-In: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
Merged-In: I24ec103ff5013ad416e3dfb1c548acd387b4ba64
Merged-In: If9fddc8b4e2e6d4d7db185ab16063e824323b9a7
Merged-In: I49159950521a013422b1087ea2c3e6cd5151457c
Merged-In: I69af58183c5b89af96c1a8808665fa506a620012
Merged-In: Ie9492f497824cd2b2727dde9d3a48452c72f1084
Merged-In: I2fd0249fd8b555e5ca93c3aec13857e6c74e157c
Merged-In: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
Merged-In: Icdcfaaf6cc7a1e1cf77e89a79d0425cab4405ffc
Merged-In: I697528ff260a0f8e54aa1188e35143e668800e7d
Merged-In: I1486782f476acaf1e2e4b66df57869409239986f
Merged-In: I804b50a38c877da80b5ef3251e16029259014152
Merged-In: I39eec9ebc1db2dc14669f27b17624394e25eb47f
Merged-In: I054a6df08046cda1c2f202390ed24839a6b10349
Merged-In: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Merged-In: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
2017-11-20 16:39:59 -08:00
Treehugger Robot
942d418da9
Merge "Add an activity that starts DataUsageList fragment for mobile."
2017-11-21 00:35:41 +00:00
Bill Yi
967ad51df4
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 59a800d0ec
2017-11-20 22:53:31 +00:00
TreeHugger Robot
59a800d0ec
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-20 22:46:59 +00:00
Bill Yi
97c257520a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266 -s ours
...
am: 9a7789a0fc
2017-11-20 22:36:07 +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
Jie Cheng
74ffa3a130
Merge "Preference SimSettingsActivity not aligned correctly" am: 8d3d166823
...
am: c6525f5e24
2017-11-16 20:20:45 +00:00
Jie Cheng
c6525f5e24
Merge "Preference SimSettingsActivity not aligned correctly"
...
am: 8d3d166823
2017-11-16 20:18:44 +00:00
Treehugger Robot
8d3d166823
Merge "Preference SimSettingsActivity not aligned correctly"
2017-11-16 20:14:27 +00:00
Jie Cheng
e0aa432978
Preference SimSettingsActivity not aligned correctly
...
The preference SimSettingsActivity in the screen "Network & Internet"
never uses a summary. However the text for this preference ("SIM cards")
is top aligned in order to make room for an extra line for the
non-existing summary.
Solved by setting the summary to @string/summary_empty for the
preference SimSettingsActivity. This will make the text in the
preference to align correctly and not leave extra room for a summary.
Test: manual - Checked that preference SimSettingsActivity is correctly
aligned in screen "Network & Internet".
Bug: 69405185
Change-Id: I1a1b3fa7253bbf2a5299f54cc8c4d3e857ca059c
2017-11-16 15:57:08 +00:00
Fan Zhang
7d72837179
Merge "Catch exception when checking WifiDisplay availability" am: 7a08901d1b
...
am: 6d5e7bf41f
2017-11-16 01:36:10 +00:00
Fan Zhang
6d5e7bf41f
Merge "Catch exception when checking WifiDisplay availability"
...
am: 7a08901d1b
2017-11-16 01:33:31 +00:00
Treehugger Robot
7a08901d1b
Merge "Catch exception when checking WifiDisplay availability"
2017-11-16 01:27:57 +00:00
