Commit Graph

33360 Commits

Author SHA1 Message Date
Marie Janssen
bb10fda3b9 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2 am: e10af2add7 am: 5741187f31
am: 43e2d0a759

Change-Id: I227d5c656c6079b5bcbfcee7c1028fcaf2a8d083
2017-01-31 19:28:46 +00:00
Pavlin Radoslavov
355ee420de Merge "Update the A2DP Codec Config API" am: bd298a7a50 am: 96dda78d24 am: 6fbaebd7e8
am: 502de2cfa2

Change-Id: Ib894f4f4f2587cda27cdf6c4e3dba70a7fdbc0d0
2017-01-31 19:25:30 +00:00
Marie Janssen
43e2d0a759 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2 am: e10af2add7
am: 5741187f31

Change-Id: I7ecebb4aebb9755571baebf00718156d28415f3e
2017-01-31 19:24:12 +00:00
Pavlin Radoslavov
502de2cfa2 Merge "Update the A2DP Codec Config API" am: bd298a7a50 am: 96dda78d24
am: 6fbaebd7e8

Change-Id: I677b6fdc1280337c5b383aa0e681cba44db23c94
2017-01-31 19:18:46 +00:00
Marie Janssen
5741187f31 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" am: fb0ab547c2
am: e10af2add7

Change-Id: I29267583329aba9eae91863e83641a00f12cae9d
2017-01-31 19:16:35 +00:00
Marie Janssen
e10af2add7 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action"
am: fb0ab547c2

Change-Id: Ib054cb7d23a28d45345ef680247b5788fbc989f4
2017-01-31 19:14:47 +00:00
Pavlin Radoslavov
6fbaebd7e8 Merge "Update the A2DP Codec Config API" am: bd298a7a50
am: 96dda78d24

Change-Id: I2cdd1e9117076b17fcf218e8f50a86d9c36b3474
2017-01-31 19:13:20 +00:00
Marie Janssen
fb0ab547c2 Merge "Bluetooth: remove unused SINK_STATE_CHANGED action" 2017-01-31 19:09:34 +00:00
Pavlin Radoslavov
96dda78d24 Merge "Update the A2DP Codec Config API"
am: bd298a7a50

Change-Id: I5d3e3c0d3d6e3d679ad94779600a9e266f7f927b
2017-01-31 19:08:11 +00:00
Pavlin Radoslavov
bd298a7a50 Merge "Update the A2DP Codec Config API" 2017-01-31 19:02:36 +00:00
Doris Ling
7247d45e1c Merge "Make UsersDashboardAlias primary profile controlled." 2017-01-31 18:14:41 +00:00
William Mee
8be6862021 Merge "Adds a default for the badging curve thresholds to Settings app resources; this will be the fall-back default used by the WifiSettings in follow-on work." 2017-01-31 16:54:48 +00:00
Julia Reynolds
5bee768257 Fix notification assistant setting
Test: make cts-verifier
Change-Id: I9029e792ef3d32e433012d86ba828e3c741799cb
2017-01-31 10:47:57 -05:00
Bill Yi
6dc17f838d Import translations. DO NOT MERGE am: 2a3b062c4a -s ours
am: bb2a8f15cb  -s ours

Change-Id: I41d1afe145de55b33b6b20db3392d99e3debed19
2017-01-31 08:47:00 +00:00
Bill Yi
bb2a8f15cb Import translations. DO NOT MERGE
am: 2a3b062c4a  -s ours

Change-Id: Ic11826d8d728ca3324bd0bc75455ccf6fe7c3008
2017-01-31 08:42:59 +00:00
Bill Yi
2a3b062c4a Import translations. DO NOT MERGE
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
2017-01-30 23:10:41 -08:00
songchenxi
8c268e08d4 Increase character limit for a string
Increase the "App-level permission" string's character limit from 30
to 42

Test: Manual
bug: 34810404
Change-Id: Idaf7495ee45a55afc4fa5a9541f2ed12b9e76386
2017-01-30 22:49:24 -08:00
Philip P. Moltmann
81758edffa [DO NOT MERGE] Use new QueuedWork interface.
Test: Ran SharedPreferences CTS tests

Bug: 33385963
Bug: 30662828

Change-Id: I8025a087b43462324d0d45555094cbb54a671404
(cherry picked from commit 231c9fbfa6)
2017-01-31 02:51:04 +00:00
Stephen Chen
96db39691f Merge "Move AdvancedWifiSettings into ConfigureWifiSettings." 2017-01-31 02:08:36 +00:00
Pavlin Radoslavov
2829ca322a Update the A2DP Codec Config API
Previously, the JNI upcall would contain only the current codec config.
In the new API, the upcall contains:
 1. The current codec config
 2. The list of codecs containing the local codecs capabilities
 3. The list of codecs containing the selectable codecs capabilities.
    This list is the intersection of the local codecs capabilities
    and the capabilities of the paired device.

Also, refactored the Java internals to accomodate the extra information:
 * Added new class BluetoothCodecStatus that contains the extra info:
   current codec config, local codecs capabilities and selectable
   codecs capabilities
 * Renamed method getCodecConfig() to getCodecStatus() and return the
   corresponding BluetoothCodecStatus object.
 * Updates to class BluetoothCodecConfig:
   new methods isValid(), getCodecName(), and updated toString()
   so it is more user friendly
 * Removed BluetoothCodecConfig.EXTRA_CODEC_CONFIG and
   EXTRA_PREVIOUS_CODEC_CONFIG.
   The former is superseded by BluetoothCodecStatus.EXTRA_CODEC_STATUS;
   the latter is not really used.

Test: A2DP streaming with headsets and switching the codecs

Change-Id: I490a70c82b686be7105862aeaeafcff495369dae
2017-01-30 16:22:24 -08:00
Robin Lee
805d59dc1d Fix 4 broken work profile tests
Commit 2953f31b61 skipped
RunSettingsRoboTests. The tests started failing because
WorkSoundPreferenceController calls UserManager.isUserUnlocked(int) now
which is not implemented in robolectric.

Fixed by adding a wrapper method to AudioHelper.

Fix: 34819603
Test: make RunSettingsRoboTests
Change-Id: Ia79cc4def9442706752f7e7b9a895ffa8150fd9d
2017-01-31 00:08:52 +00:00
Maurice Lam
4dfe53e181 Merge "Suppress failing Settings Robolectric tests" 2017-01-30 23:52:26 +00:00
Stephen Chen
9d2712cd78 Move AdvancedWifiSettings into ConfigureWifiSettings.
Bug:34719854
Test: make -j40 RunSettingsRoboTests
clicked on preferences and made sure functionality did not change.

Change-Id: Ia5f0c7f5ea0f88d1322008ab58ca79028cc1a2bb
2017-01-30 12:43:08 -08:00
Julia Reynolds
5d1506a2af Show channel groups in settings.
Test: manual
Change-Id: Icfaed2d2d898245fcfa50b25d7ad456e4db07bae
2017-01-30 14:58:35 -05:00
Julia Reynolds
cee1e36fbf Merge "Audio attributes" 2017-01-30 19:37:07 +00:00
Marie Janssen
eb6c51543d Bluetooth: remove unused SINK_STATE_CHANGED action
android.bluetooth.a2dp.action.SINK_STATE_CHANGED is unused.

Test: compiles
Bug: 34395439
Change-Id: I5c347886fdf9dbdf15feb82f2a9622dd22f010b6
2017-01-30 19:29:54 +00:00
Marie Janssen
9787d19947 resolve merge conflicts of 1c98d85cf6 to master
Change-Id: Ie4401bf35d4a56865faa5476b86b2a384ad21231
2017-01-30 10:21:05 -08:00
Marie Janssen
1c98d85cf6 Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4 am: 184506a710
am: 83fb10ae1e

Change-Id: Ib7a51c9cae91202087bfcc11e6eb18b219e84d36
2017-01-30 18:02:01 +00:00
Marie Janssen
83fb10ae1e Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am: 1ad23a71e4
am: 184506a710

Change-Id: I6114e7b4617e7f23373434a54672497654d6d786
2017-01-30 17:57:11 +00:00
Marie Janssen
184506a710 Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
am: 1ad23a71e4

Change-Id: I045b82e81d1fdd3d8844efbd2c79d41fdd6d8aa6
2017-01-30 17:51:50 +00:00
Marie Janssen
1ad23a71e4 Merge "Bluetooth: remove BluetoothDiscoveryReceiver" 2017-01-30 17:46:17 +00:00
Anton Philippov
e80a28ee18 Merge "Add a screen to show OEM backup settings." 2017-01-30 16:39:42 +00:00
Anton Philippov
adfec5563e Add a screen to show OEM backup settings.
Moves the backup settings logic to BackupSettingsHelper and
BackupSettingsActivity:
- If the manufacturer provides the intent and the label for their backup
settings in the config.xml, a new intermediate fragment is shown for
Backup settings to let the user pick either standard backup settings or
OEM provided backup settings.
- If config.xml doesn't contain the intent, BackupSettingsActivity is
used as a trampoline activity to launch backup settings provided by the
backup transport of the default backup settings activity, i.e.
PrivacySettingsActivity.

Bug: 34700410
Bug: 33655074
Bug: 33654991
Test: make RunSettingsRoboTests
Change-Id: I78e340fbf926b2a9dc2c4e3942f9337c3c7a933c
2017-01-30 16:17:28 +00:00
Nicolas Prévot
67b3450f33 Merge "Add policy transparency to Settings > device administrators" 2017-01-30 11:24:01 +00:00
Maurice Lam
f04ff76af0 Suppress failing Settings Robolectric tests
- Assume API 24 for some settings robolectric tests since they are
broken by referencing API new in version 24. Those tests will be
ignored until Robolectric is updated to support SDK 24.

- Comment out failing DatabaseIndexingManagerTest.

Test: cd tests/robotests && mma
Change-Id: Id71211b7a6836d55f31524c4cfe9628c2de78097
2017-01-28 13:10:14 -08:00
Daniel Nishi
ea40813d04 Merge "Go to the old storage settings when using non-internal storage." 2017-01-27 22:57:34 +00:00
jackqdyulei
3ee22131a4 Add summary for items in App Usage List in Battery page
This summary shows the active time of the app. For example
"Used for 27m".

Bug: 34467139
Test: RunSettingsRoboTests & Take screenshots
Change-Id: I0ef48427ad21be4dacd290fffb2c5d519ef58506
2017-01-27 14:15:38 -08:00
Doris Ling
31921dfa82 Make UsersDashboardAlias primary profile controlled.
Add PRIMARY_PROFILE_CONTROLLED metadata to UsersDashboardAlias and
add it to the Settings list for restricted user, so that it will be
shown to other users.

Change-Id: I9c090b15c3dced75eb7a405bd109ca7fb51807ab
Fix: 34194505
Test: Visual
2017-01-27 13:13:17 -08:00
TreeHugger Robot
8201bcb710 Merge "Move intent action to xml" 2017-01-27 20:49:03 +00:00
Salvador Martinez
0e5b8f14c1 Merge "Remove fake data" into nyc-mr2-dev am: d258b2f40f -s ours
am: 14db171c1b  -s ours

Change-Id: I74408491dfeb629b39afa874fb166856a1d85f6e
2017-01-27 20:37:29 +00:00
Salvador Martinez
48672fd86e Remove fake data am: a1499c3005 -s ours
am: a7b1c967b7  -s ours

Change-Id: If6738d1bba8dd8207b79c0082799ba24a09062f0
2017-01-27 20:37:13 +00:00
TreeHugger Robot
7036d46889 Merge "modified settings to use settingslib class" 2017-01-27 20:35:35 +00:00
Salvador Martinez
14db171c1b Merge "Remove fake data" into nyc-mr2-dev
am: d258b2f40f  -s ours

Change-Id: Ic418e0cbdd54679f0af152b13f52f34d963da8b6
2017-01-27 20:34:41 +00:00
Salvador Martinez
a7b1c967b7 Remove fake data
am: a1499c3005  -s ours

Change-Id: Iea66d48fba72ff28bbc81a1499084a9afcd1e569
2017-01-27 20:34:39 +00:00
TreeHugger Robot
d258b2f40f Merge "Remove fake data" into nyc-mr2-dev 2017-01-27 20:31:40 +00:00
Julia Reynolds
893b7d075f Audio attributes
Test: manual
Change-Id: I4f298019a42520370a3867e332274abe299cff2d
2017-01-27 15:19:11 -05:00
Salvador Martinez
879bb643f8 Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev am: 4edcb927ab
am: 387fdd058e  -s ours

Change-Id: I05efb9a970bbd055d37a7bcf7a204675109d4001
2017-01-27 20:05:17 +00:00
Salvador Martinez
bb88606a41 Fix null pointer exception when surveys are turned off am: 9db3cb3bee
am: e2904eb7fa  -s ours

Change-Id: I3ebd619327fa399e8fab9ead6e1de63a67ce1306
2017-01-27 20:05:09 +00:00
Salvador Martinez
387fdd058e Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
am: 4edcb927ab

Change-Id: I384020dab83593e815c0afc0d5c2657c9dcaacbc
2017-01-27 20:03:12 +00:00
Salvador Martinez
e2904eb7fa Fix null pointer exception when surveys are turned off
am: 9db3cb3bee

Change-Id: I9f71f40a715cfb65d8a5bc53fed64e674bd0515d
2017-01-27 20:03:08 +00:00