Commit Graph

30337 Commits

Author SHA1 Message Date
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

Change-Id: Ida107059b3a5ec815f198659ff8174c8ff375efe
2017-01-25 16:10:29 +00:00
Marie Janssen
60eb5503e8 Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9
am: a2e068a2b4

Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8
2017-01-25 16:08:01 +00:00
Marie Janssen
a2e068a2b4 Merge "Make headset icons consistent before / after pairing"
am: 690bdb22c9

Change-Id: I64a9a3a7d8a2f110ee1809af33583f82fc4b4f57
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

Change-Id: Ia13886f7e3214e355db017b4463a956c0971b021
2017-01-21 19:50:24 +00:00
Stefanot
eecfc2c5f7 Add SuggestionFeatureProvider interface.
am: 2eac39b393

Change-Id: I87fae019229983b97c19710b6cf73f4e1d05dff1
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  -s ours

Change-Id: Ibffbb54ef91658ce4df98228fd4e672995fa9aec
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

Change-Id: I15e2263b5907f10f385d07e2797b43240e2eed65
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

Change-Id: If1956964597ad1885dde00f23c55a4492f867977
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

Change-Id: Id20c96f550ecf7c05926eaea8a29575aeb8aaa07
2017-01-19 23:23:37 +00:00
Robin Lee
fde3c6d74a Merge "Clear VPN after Clear credentials if VPN is being established"
am: 4ce19f5c4f

Change-Id: Ib35450b0c389da1bbba311c05d1d0346eb612b9e
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

Change-Id: Ifc88129c31c074674f42ee356382dd6aa5022952
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

Change-Id: Id36b48a4a25aa564b5270ad16aa5a2eb1eadfadb
2017-01-19 15:20:26 +00:00
Paul Duffin
a3da659863 Merge "Prepare for removal of legacy-test from default targets"
am: a6b0c881fd

Change-Id: Iadb65fd5a2630e74071866f2d0b4347d29a71af1
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  -s ours

Change-Id: I389d6dd23abc7e3476d00a25ab958d1de44b7e09
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

Change-Id: I0680026da45bb1828c70ec051e789b0845176702
2017-01-18 20:41:29 +00:00
Pavlin Radoslavov
4dac712d7c Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02
am: 058533ae25

Change-Id: I49b4565644c584a69897f4b642a1b308fe9df0f0
2017-01-18 20:29:44 +00:00
Pavlin Radoslavov
058533ae25 Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am: b057b2da02

Change-Id: I892ea30d6fb15ba10859cd48788260e5ad8ad380
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

Change-Id: If23c0926eecf6a08ed0c0ab174cdddb43e31cc00
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.

Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
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

Change-Id: I20b3bc10cf66bb94369631cef229787b5e6353b6
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

Change-Id: I29a2a6032b02309ae9e966f517774f5ce1451c3b
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.

Bug: 33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
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

Change-Id: I3b5d1278bf2d2e237b9d0c7bd8349de451fc263b
2017-01-13 22:40:40 +00:00
Jaewoong Jung
c360bc5813 Adds a menu item for additional battery info to battery settings.
am: 7b557df0e4

Change-Id: Iaef847979f64bf93b87457fa3f2f734b1789c830
2017-01-13 22:40:38 +00:00
Jaewoong Jung
bd775165d4 Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev 2017-01-13 22:38:11 +00:00
Jaewoong Jung
7b557df0e4 Adds a menu item for additional battery info to battery settings.
This is a manual cherry-pick of commit
1e0f8ff5e5.

Bug: 33352540
Test: No additional test failures.

Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a
2017-01-13 12:58:44 -08:00
Salvador Martinez
cfd475feb5 Removed fake data
am: 4b69b113fb

Change-Id: Idc8731119c9dca50135c15454944d8b20aa89730
2017-01-13 01:06:45 +00:00
Salvador Martinez
4b69b113fb Removed fake data
Was using fake data for testing that we could attach
payloads. This is no longer needed since we are now
attaching real data.

Test: Manual Verification on GCS
Bug: 27823357
Change-Id: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
2017-01-12 10:53:42 -08:00
Bill Yi
e1f3b34abc Import translations. DO NOT MERGE
am: 39c04bb92b  -s ours

Change-Id: I79582468959e2a04d6ea69a9faedaf28c67f1986
2017-01-12 17:17:41 +00:00
Bill Yi
39c04bb92b Import translations. DO NOT MERGE
Change-Id: I83e0e51b5552d44b66a84d5abdaac59ec3932c64
Auto-generated-cl: translation import
2017-01-12 06:02:43 -08:00
Salvador Martinez
94422fc8f9 Added survey triggering mechanisms
am: 2cb82c55a0

Change-Id: Ib1a98fc3351059a7811c41f616507abec689a98a
2017-01-12 02:07:21 +00:00
Salvador Martinez
2cb82c55a0 Added survey triggering mechanisms
Surveys can now be triggered on a subset of Settings screens.
Surveys can also be modified/created for this subset of
screens remotely.

Test: RoboTests(master) && JUnitTests
Bug: 27823357
Change-Id: I1534af5573bef6f6c65c9c99b6f5a2917c3325b9
2017-01-11 16:27:11 -08:00
Salvador Martinez
40c7468673 Added feature for surveys provider to Settings
am: cd0fe608c5

Change-Id: I13ceb5009800cb25483d85220c0ec22051f79cbe
2017-01-11 19:41:26 +00:00
Salvador Martinez
cd0fe608c5 Added feature for surveys provider to Settings
It is now possible to create and show surveys to a user
asking them for feedback within the Settings app.

Test: In Master Branch
Bug: 27823357
Change-Id: I824899045f6ce30e5b6f46d20888da673114f658
2017-01-11 09:51:31 -08:00