Steven Moreland
7ea5b6d740
Merge "Development Options: toggle binderized hals" am: 5f854f39a8 am: 8076dcde0c
...
am: ec0e1fb59f
2017-01-26 10:06:43 +00:00
Steven Moreland
ec0e1fb59f
Merge "Development Options: toggle binderized hals" am: 5f854f39a8
...
am: 8076dcde0c
2017-01-26 10:03:46 +00:00
Steven Moreland
8076dcde0c
Merge "Development Options: toggle binderized hals"
...
am: 5f854f39a8
2017-01-26 10:01:15 +00:00
Treehugger Robot
5f854f39a8
Merge "Development Options: toggle binderized hals"
2017-01-26 09:57:39 +00:00
Bill Yi
398db3e566
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 063b543124
2017-01-26 07:11:30 +00:00
Bill Yi
b33b8c9081
Import translations. DO NOT MERGE
...
am: db68fc320f
2017-01-26 07:11:29 +00:00
TreeHugger Robot
063b543124
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-01-26 07:06:17 +00:00
Steven Moreland
73dd0ae30e
Development Options: toggle binderized hals
...
This allows for quick performance testing and also for a better
dogfooding experience.
Bug: 34256441
Test: Verification with getprop.
Change-Id: I81c5e0b1044d4569a6fe55a4b30f7e21c4465fc2
2017-01-25 22:03:45 -08:00
Bill Yi
db68fc320f
Import translations. DO NOT MERGE
...
Change-Id: Ibb3ccac189513a5a988ec8c857f2ad574371808a
Auto-generated-cl: translation import
2017-01-25 20:04:52 -08:00
Jerry Zhang
8b6614cdc3
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
...
am: 361a3e2090
2017-01-25 21:33:23 +00:00
Jerry Zhang
a0b75ff516
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
am: a291336bd8
2017-01-25 21:24:02 +00:00
Jerry Zhang
361a3e2090
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
2017-01-25 20:30:18 +00:00
Stefanot
1c72ce06d1
*DO NOT MERGE* Create new suggestion category for backup.
...
Test: manual
BUG: 34219298
Change-Id: I288d36b2b48582e5f8e0d1720d1f7004ad8dae2c
2017-01-25 19:18:08 +00:00
Marie Janssen
a78e718b26
Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9 am: a2e068a2b4
...
am: 60eb5503e8
2017-01-25 16:10:29 +00:00
Marie Janssen
60eb5503e8
Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9
...
am: a2e068a2b4
2017-01-25 16:08:01 +00:00
Marie Janssen
a2e068a2b4
Merge "Make headset icons consistent before / after pairing"
...
am: 690bdb22c9
2017-01-25 16:06:00 +00:00
Marie Janssen
690bdb22c9
Merge "Make headset icons consistent before / after pairing"
2017-01-25 16:02:14 +00:00
Jerry Zhang
a291336bd8
Refactor setCurrentFunction and setUsbDataUnlocked into one method
...
This allows us to get rid of an extraneous config switch and
simplify some code.
Bug: 31814300
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit 5d36a177d9
2017-01-24 13:27:14 -08:00
Xiaodong Xu
262f7fba9a
Make headset icons consistent before / after pairing
...
Previously A2DP would be shown before pairing with a HFP device.
bug: 30677445
Change-Id: I0e9ab17197e6ee099d890d5368def36a14ca8344
2017-01-23 17:25:27 +00:00
Stefano Tommasini
698862f60d
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
...
am: bd16255ee1
2017-01-21 19:50:24 +00:00
Stefanot
eecfc2c5f7
Add SuggestionFeatureProvider interface.
...
am: 2eac39b393
2017-01-21 19:50:22 +00:00
Stefano Tommasini
bd16255ee1
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
2017-01-21 19:44:16 +00:00
Stefanot
2eac39b393
Add SuggestionFeatureProvider interface.
...
The interface is added so that a vendor can add new suggestions to the
settings app, and customize details for these suggestions.
Test: make RunSettingsRoboTests
BUG: 34219298
Change-Id: I373c63709b1aaf68360aa2561a2ecfc3194e0e2b
2017-01-21 14:34:04 +00:00
Bill Yi
f8a7c81d66
Import translations. DO NOT MERGE
...
am: 2c570117a8
2017-01-21 01:21:06 +00:00
Bill Yi
2c570117a8
Import translations. DO NOT MERGE
...
Change-Id: I6aed674efc270223bddfd6fbdae50a98ae695276
Auto-generated-cl: translation import
2017-01-20 12:31:51 -08:00
Jack He
244ebc1e31
Fix Bluetooth pairing dialogue crash
...
am: e51972868c
2017-01-19 23:45:28 +00:00
Robin Lee
cb1968148a
Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f am: fde3c6d74a
...
am: 185275e0ad
2017-01-19 23:31:21 +00:00
Robin Lee
185275e0ad
Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f
...
am: fde3c6d74a
2017-01-19 23:23:37 +00:00
Robin Lee
fde3c6d74a
Merge "Clear VPN after Clear credentials if VPN is being established"
...
am: 4ce19f5c4f
2017-01-19 23:13:04 +00:00
Robin Lee
4ce19f5c4f
Merge "Clear VPN after Clear credentials if VPN is being established"
2017-01-19 23:02:21 +00:00
Jack He
e51972868c
Fix Bluetooth pairing dialogue crash
...
When pairing passkey is invalid, onCreate() should return early to
prevent any dialog from displaying, which will then call onDestroy()
to destroy the activity. However mReceiver should be registered before
onDestroy() is called as onDestroy() will call unregisterReceiver(mReceiver)
that will throw an IllegalArgumentException when mReceiver was not registered.
This fix adds a flag that tracks whether mReceiver has been registered.
In addition, this fix fails the passkey confirmation request upon invalid
passkey.
Bug: 32577328
Test: Test with PTS TC_SERVER_SA_BI_01_C
Change-Id: Ifc047bad6bd99abca04404af9cd54d2034cd35aa
(cherry picked from commit 6f8e9eda2d9ed830d47971d93327792906db2dc1)
2017-01-19 22:39:17 +00:00
Paul Duffin
61316803f2
Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd am: a3da659863
...
am: cf967da02a
2017-01-19 15:22:55 +00:00
Paul Duffin
cf967da02a
Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd
...
am: a3da659863
2017-01-19 15:20:26 +00:00
Paul Duffin
a3da659863
Merge "Prepare for removal of legacy-test from default targets"
...
am: a6b0c881fd
2017-01-19 15:17:53 +00:00
Treehugger Robot
a6b0c881fd
Merge "Prepare for removal of legacy-test from default targets"
2017-01-19 15:13:15 +00:00
Paul Duffin
b67ddbbd25
Prepare for removal of legacy-test from default targets
...
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Merged-In: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9
Change-Id: I980111b4b83d16ccd9d3a277ab2587bf638a2c8a
2017-01-19 09:43:07 +00:00
Bill Yi
a46e4a4e49
Import translations. DO NOT MERGE
...
am: 0446865d68
2017-01-19 04:51:51 +00:00
Bill Yi
0446865d68
Import translations. DO NOT MERGE
...
Change-Id: I610fb1c188fb93d6e2d70dd52da7dd766d27c209
Auto-generated-cl: translation import
2017-01-18 19:10:06 -08:00
Pavlin Radoslavov
4d70b69d7a
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02 am: 058533ae25
...
am: 4dac712d7c
2017-01-18 20:41:29 +00:00
Pavlin Radoslavov
4dac712d7c
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02
...
am: 058533ae25
2017-01-18 20:29:44 +00:00
Pavlin Radoslavov
058533ae25
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
...
am: b057b2da02
2017-01-18 20:25:52 +00:00
Tamas Berghammer
6031fba9f2
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
am: 5a638a6ad1
2017-01-18 20:24:36 +00:00
Treehugger Robot
b057b2da02
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
2017-01-18 20:20:48 +00:00
Tamas Berghammer
5a638a6ad1
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
This reverts commit fbd5f5fdce
2017-01-18 19:28:11 +00:00
Pavlin Radoslavov
dd39c073d6
Update/cleanup Bluetooth Codec strings in Developer Settings
...
* Use the summary strings instead of the titles strings as appropriate.
* Use proper translatable strings instead of hard-coded "Streaming: "
embedded string.
Test: UI visual observation
Change-Id: I0222afc30c75e68e2568c33c781755802d86c502
2017-01-18 10:35:35 -08:00
Tamas Berghammer
6cd7e52b9e
Update package names to work with the proto3 compiler
...
am: fbd5f5fdce
2017-01-18 17:45:33 +00:00
insight.lee
03159e4c85
Clear VPN after Clear credentials if VPN is being established
...
1. There is no way to disconnect VPN after 'Clear credentials'
without removing whole Internet connection because VPN profile to
disconnect is removed when Clear credentials.
2. This commit checks whether VPN is being established or not when
Clear credentials and disconnect VPN if VPN is being established.
Lastly, this shows a toast message to inform VPN disconnected.
Test: manual - took a photo
Signed-off-by : Sungmin Lee <insight.lee@lge.com >
Bug: 29093779
Change-Id: Id5ea01c8731b3b0fca2a31d9d84e8c103952b377
2017-01-18 10:44:57 +09:00
Jaewoong Jung
487458d23d
Implements additional battery info menu behavior.
...
am: 8a49de31ab
2017-01-14 06:05:56 +00:00
Jaewoong Jung
8a49de31ab
Implements additional battery info menu behavior.
...
This is a manual cherry-pick of commit
6a43a06cac
2017-01-13 14:56:47 -08:00
Jaewoong Jung
482b27320a
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
...
am: bd775165d4
2017-01-13 22:40:40 +00:00
