Commit Graph

40326 Commits

Author SHA1 Message Date
Bill Yi
3cf7a46b83 Import translations. DO NOT MERGE
am: 509d7bbc5d  -s ours

Change-Id: I3e779491dc73f006b0f759d02b0072a06b952ead
2018-03-03 12:50:06 +00:00
Bill Yi
509d7bbc5d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I22bc99cc231771403dd9be9ec77fa0391e4e874d
2018-03-01 14:23:13 -08:00
Jack He
6852928a75 Merge "Bluetooth: Use config value for default max connected audio devices" am: 57f8e717c7 -s ours
am: 786fa66b6d

Change-Id: Ibec2e409300f36f36f2ec005233d32bd4c712e51
2018-03-01 21:44:28 +00:00
Jack He
786fa66b6d Merge "Bluetooth: Use config value for default max connected audio devices"
am: 57f8e717c7  -s ours

Change-Id: I9b6e16237723c8a5903d011d2ee6a948c4f3ed47
2018-03-01 21:40:20 +00:00
Treehugger Robot
57f8e717c7 Merge "Bluetooth: Use config value for default max connected audio devices" 2018-03-01 19:34:20 +00:00
Jack He
77ee7ea00d Bluetooth: Use config value for default max connected audio devices
* The first option in Bluetooth max connected audio devices preference
  should be using system default
* Added template based string array to show system default in the list
  preference and in preference summary when default is chosen
* Reset max connected audio devices property to empty string when
  development setting is disabled or when system default is chosen
* Fix a bug by saving selected value to list preference so that it
  persists when user re-opens development settings

Bug: 64767509
Test: Enable and disable multi-device mode in development settings
Change-Id: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
Merged-In: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
2018-02-28 18:34:52 -08:00
Andreas Gampe
fd99b8b009 Merge changes I06df032d,Ib923de28 am: 59a548b940
am: 34f43b50ce

Change-Id: I0bb87911c11685bcc8caa58d5a3ce9cf044e4ee1
2018-02-28 04:51:14 +00:00
Andreas Gampe
34f43b50ce Merge changes I06df032d,Ib923de28
am: 59a548b940

Change-Id: I4d1314379ba77c07b64c3ca5c77a61f9a54d4c1d
2018-02-28 04:37:06 +00:00
Treehugger Robot
59a548b940 Merge changes I06df032d,Ib923de28
* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests
2018-02-28 03:34:13 +00:00
Chen Xu
648d302ba7 Merge "rename emergency tone settings" am: 2054a4d6d4
am: eb664426c5

Change-Id: I9c4bd1ae9ac8c13732686949ce316c7abf8e5c75
2018-02-28 02:43:59 +00:00
Chen Xu
eb664426c5 Merge "rename emergency tone settings"
am: 2054a4d6d4

Change-Id: I106fc98ae0dab79e5e8bc9b5ec10c3810a440aaa
2018-02-28 02:38:23 +00:00
Andreas Gampe
20146916e2 Settings: Disable failing tests.
Temporarily disable.

(cherry picked from commit b506fb9b19)

Bug: 73892008
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherrypick
Merged-In: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Change-Id: I06df032d4a4de84c2f9f46e5086d97f688b0c989
2018-02-27 18:19:10 -08:00
Chen Xu
2054a4d6d4 Merge "rename emergency tone settings" 2018-02-28 02:17:26 +00:00
Andreas Gampe
d70c4a0036 Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.

Found by errorprone.

(cherry picked from commit 22bad556a1)

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Exempt-From-Owner-Approval: Cherrypick
Merged-In: Ib923de28ce5dcf79b9dec718306877e31e58e024
Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024
2018-02-27 18:15:53 -08:00
fionaxu
192f75c3b2 rename emergency tone settings
Bug: 67470733
Test: Manual
Change-Id: I67e223c2db662f518fa306221190d4646668c4d3
2018-02-27 15:19:29 -08:00
Andreas Gampe
2658f2059c Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 am: ffec1a0c68
am: 8d0a8ed985

Change-Id: I0eb99bc2c2d1ec67c23ad020627a2cf43cfbb71d
2018-02-26 22:16:43 +00:00
Andreas Gampe
8d0a8ed985 Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
am: ffec1a0c68

Change-Id: Ibac8d021d8d65fdab91f682b9fbfc0231a61a93f
2018-02-26 22:08:50 +00:00
Andreas Gampe
257f42fd9d Merge changes I67dbf04a,I032f6741 am: 727ec42d8d
am: 6b24cc5769

Change-Id: Ib649c224f4496785ae1eba0bce3a411eca8aa1bd
2018-02-26 22:08:42 +00:00
Andreas Gampe
6b24cc5769 Merge changes I67dbf04a,I032f6741
am: 727ec42d8d

Change-Id: I4c8ce0fa68ae3fbf2a3e835d165a766b6e6aad5c
2018-02-26 22:01:25 +00:00
Treehugger Robot
ffec1a0c68 Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
* changes:
  Settings: Disable failing test
  Settings: Disable failing test
  Settings: Fix assertThat in tests
2018-02-26 22:00:19 +00:00
Treehugger Robot
727ec42d8d Merge changes I67dbf04a,I032f6741
* changes:
  Settings: Disable failing assert
  Settings: Fix assertThat in test
2018-02-26 21:36:15 +00:00
Andreas Gampe
8f4716c401 Settings: Disable failing assert
Temporarily disable.

Bug: 73892004
Test: m RunSettingsRoboTests
Change-Id: I67dbf04ae59e54632155c3eda67c70335147fd19
2018-02-26 12:35:13 -08:00
Andreas Gampe
8123135388 Settings: Disable failing test
Disable temporarily.

Bug: 73892683
Test: m RunSettingsRoboTests
Change-Id: I8dcc30b0b090fef1f2fd8fa3c6de7bf69e8b97a9
2018-02-26 12:31:05 -08:00
Andreas Gampe
d20728e4ef Settings: Disable failing test
Disable temporarily.

Bug: 73892555
Test: m RunSettingsRoboTests
Change-Id: I85292ad20de2cb169825eccb19dff1eb82e6fbe1
2018-02-26 12:31:05 -08:00
Andreas Gampe
72eb284ae7 Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.

Found by errorprone.

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie0ab35348fa56c73e6257477a50ff130450e74e7
2018-02-26 12:26:36 -08:00
Andreas Gampe
025ec2ba58 Settings: Fix assertThat in test
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.

Found by errorprone.

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: I032f6741ac0c728781a9d22ab6158e7b74a30167
2018-02-26 12:13:00 -08:00
Yoshinori Hirano
e847fbe6a0 Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" am: 8378efc6af -s ours
am: 942249a2dd  -s ours

Change-Id: I23af2770255199348eaa8c69d990ff2907ff90de
2018-02-24 23:54:26 +00:00
Yoshinori Hirano
942249a2dd Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE"
am: 8378efc6af  -s ours

Change-Id: Ic3274cd389282ac819d41830fa907d7fcf9ddb61
2018-02-24 23:48:50 +00:00
Treehugger Robot
8378efc6af Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" 2018-02-24 23:28:45 +00:00
Yoshinori Hirano
d3bb6c6459 Add SettingsMultiSelectListPreference style DO NOT MERGE
There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.

Fixes: 66928311
Test: manual - Add a new APN and tap Bearer

Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
2018-02-24 16:00:05 +00:00
Hansong Zhang
c9f1e73dc7 Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" am: ad84c9552d -s ours
am: d2040309ca

Change-Id: I93238df1e9d889817f0d025203ac437c12cfa2d8
2018-02-24 00:26:09 +00:00
Hansong Zhang
d2040309ca Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports"
am: ad84c9552d  -s ours

Change-Id: Icb23ebb9baaf02ac0f9469e9d4601c67d22ba5ad
2018-02-24 00:19:01 +00:00
Treehugger Robot
ad84c9552d Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" 2018-02-23 23:07:26 +00:00
hansson
685b923a1b Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible." am: f5b75dd74d
am: aa0812f42b

Change-Id: I6ef97b4506cf656194090bcf9b0df543190f1e79
2018-02-23 07:30:14 +00:00
hansson
aa0812f42b Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible."
am: f5b75dd74d

Change-Id: Ie9aa31d9a2d89a330b682c8602320ad58cbc8ae1
2018-02-23 07:24:45 +00:00
hansson
f5b75dd74d Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible." 2018-02-23 07:15:36 +00:00
Hansong Zhang
4dcc8cfaff Add developer menu entry to enable Bluetooth AVDTP delay reports
Bug: 32755225
Test: Manual test with a device that supports delay reporting
Change-Id: Ib84eb6a67c15634818efd98f6e454b323e16a8ff
Merged-In: I8f121dd7f94bce3a07deb9cb23c698829cbecd96
2018-02-23 02:12:30 +00:00
Anton Hansson
861554a2d9 packages/apps/Settings: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: Ic906adbd670c4dbfe2cdf0b71cdbeaf9ac08a27e
2018-02-22 16:12:29 +00:00
Fan Zhang
935ce87d32 Merge "Wifi: Restore hidden flag for hidden networks on update network" am: 0138575b8d
am: e1c58570d6

Change-Id: Ice03d80eedf64fb08a12471b22bfdff53b4f934b
2018-02-21 17:55:50 +00:00
Fan Zhang
e1c58570d6 Merge "Wifi: Restore hidden flag for hidden networks on update network"
am: 0138575b8d

Change-Id: Ifda4b13017d4fc74f6fabfa5f91b3bda9177fb47
2018-02-21 17:47:12 +00:00
Fan Zhang
0138575b8d Merge "Wifi: Restore hidden flag for hidden networks on update network" 2018-02-21 17:36:06 +00:00
Bill Yi
1bc57cbf3c Import translations. DO NOT MERGE
am: 3b4a3e0a0f  -s ours

Change-Id: I68a6f27af09691e2a27712ecab8c876f5eb26283
2018-02-20 18:09:10 +00:00
Bill Yi
3b4a3e0a0f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1e41ebfa49aad56d5fad9889dcea6f487457400d
2018-02-20 00:57:01 -08:00
Anurag Das
f44da638bd Wifi: Restore hidden flag for hidden networks on update network
Currently when user modifies any of the network parameter for hidden
networks, hidden flag is not updated. As a result this network is no
longer part of hidden networks, we are unable to reconnect when user
triggers wifi off and on.

This commit sets the value of hiddenSSID flag of config at the Settings
side on network update.

Test: manual test with hidden access point
Bug: 73256783

Change-Id: Ic20f03345645d8bf3bc9c3ff44910dd3f2797fec
2018-02-20 06:56:09 +00:00
Bill Yi
9843b2e552 Import translations. DO NOT MERGE
am: 27f30d2f46  -s ours

Change-Id: I02d655e5e18147b0cc6a95069db935ed39b1719d
2018-02-18 17:32:29 +00:00
Bill Yi
27f30d2f46 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia171cb822fd79c5828a9042873f4b52b6e9c6541
2018-02-16 23:15:09 -08:00
Hemant Gupta
6385eb1014 Merge "OPP: Prevent sending intent while orientation change" am: f32fa0b5f6
am: def626bea0

Change-Id: I811e1801a145e9bb010359fdb8c74fb8ca968e7d
2018-02-13 22:22:23 +00:00
Hemant Gupta
def626bea0 Merge "OPP: Prevent sending intent while orientation change"
am: f32fa0b5f6

Change-Id: Id576b0cda560d565d86d6369b7552801cac7b0cd
2018-02-13 22:10:34 +00:00
Treehugger Robot
f32fa0b5f6 Merge "OPP: Prevent sending intent while orientation change" 2018-02-13 20:43:24 +00:00
Hemant Gupta
3483fc3638 OPP: Prevent sending intent while orientation change
Steps:
1. Take any photo/picture and share it via Bluetooth
2. Before choosing remote device in Device Picker Activity, rotate
   the device.

Expected result:
File transfer should complete after selecting the device.

Actual result:
The dialog "Bluetooth share: File Unknown file not sent" is shown and
file sharing fails.

Fix:
Add configuration related check in manifest to avoid activity restart during
orientation change.

Test: File transferred successfully after step 2

Fixes: 72715713
Change-Id: I045c2940d3788059c9313e5501a7957608d8879c
2018-02-13 18:53:34 +00:00