Commit Graph

14945 Commits

Author SHA1 Message Date
Daniel Nishi
d1172942ee Merge "Add a music apps view to the Storage Settings." 2017-02-01 21:01:56 +00:00
Robin Lee
b5edf1a7a0 Merge "Fix 4 broken work profile tests" 2017-02-01 14:31:08 +00:00
Phil Weaver
55cd7415e6 Merge "Optimize a11y service capabilities" 2017-02-01 02:01:49 +00:00
Salvador Martinez
3bf9c5d57a Merge "Added survey support to second fragment type" 2017-02-01 00:09:24 +00:00
TreeHugger Robot
e5c2d1fbe3 Merge "Add summary for items in App Usage List in Battery page" 2017-01-31 23:48:28 +00:00
Phil Weaver
1540a9f10c Optimize a11y service capabilities
Bug: 27148522
Test: Trivial change. Verfied that it builds and a11y settings work.
Change-Id: I6684848604a84cf76081517a7b9b72042c74be7c
2017-01-31 13:20:53 -08:00
Christopher Tate
1e99f0ce41 Properly target the factory-reset broadcasts
Bug 34587823
Test: attempt factory reset from UI

Change-Id: I4ba65f4b7e07792b37e7587008ad0ab1bc6c1fb0
2017-01-31 20:52:52 +00:00
Salvador Martinez
09f182c385 Added survey support to second fragment type
Settings was totally redesigned which led several
screens to change what type of fragment they
extended. Unfortunately this broke surveys for some
required screens so survey support was added to the
second fragment type to fix this.

Test: Survey tests (robotests)
Bug: 34820704
Change-Id: Ic59b74c17c3d69c67600ce6a56f9f1835d2e1dda
2017-01-31 11:43:07 -08: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
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
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
Pavlin Radoslavov
96dda78d24 Merge "Update the A2DP Codec Config API"
am: bd298a7a50

Change-Id: I5d3e3c0d3d6e3d679ad94779600a9e266f7f927b
2017-01-31 19:08:11 +00:00
Doris Ling
7247d45e1c Merge "Make UsersDashboardAlias primary profile controlled." 2017-01-31 18:14:41 +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
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
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
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
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
TreeHugger Robot
7036d46889 Merge "modified settings to use settingslib class" 2017-01-27 20:35:35 +00:00
Julia Reynolds
893b7d075f Audio attributes
Test: manual
Change-Id: I4f298019a42520370a3867e332274abe299cff2d
2017-01-27 15:19:11 -05: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
Soroosh Mariooryad
729cfcbe4d Merge "Adding setting suggestion ranker." 2017-01-27 19:22:35 +00:00
songchenxi
dbf78d4c03 Move intent action to xml
This is a follow-up change for ag/1798497 which move the implementation
of OnPreferenceClickListener to the xml.
Test: Manual
bug: 34400189

Change-Id: I4691beecf829e8d98d5c6188b3ff74f4902104d2
2017-01-27 11:05:27 -08:00
Salvador Martinez
9db3cb3bee Fix null pointer exception when surveys are turned off
In some conditions the survey provider could be null on
download completion which could lead to a NPE. This
has been addressed by not requiring an instance for
the removal of the receiver.

Test: RunSettingsRoboTests (master)
Bug: 33707203
Change-Id: Id1ab1a24c697fed8e4dd259682a088b50c35f38a
Merged-In: Icfb545697f24172db734dd7dad421796edf68186
2017-01-27 10:29:10 -08:00
Sunny Goyal
a9a5356f23 Merge "Passing bind options to the service in the bind-widget permission prompt" 2017-01-27 17:59:55 +00:00
Robin Lee
0c341d7357 Merge "Prompt to start user before choosing a new ringtone" 2017-01-27 14:03:12 +00:00
TreeHugger Robot
a26df737c2 Merge "Fix null pointer exception when surveys are turned off" 2017-01-27 03:28:58 +00:00
Marie Janssen
683528db8b Bluetooth: remove BluetoothDiscoveryReceiver
Use new function getDiscoveryEndMillis() to replace use of shared preferences
and intents.

Test: scan recently, then connect from external BT device
Bug: 34395439
Change-Id: Ia498b3bb4868b656cbbb9fbdc607a49af948343b
2017-01-26 15:38:05 -08:00
Daniel Nishi
1db848885d Go to the old storage settings when using non-internal storage.
There are a few things which, currently, can only be done on
the old storage view. We can continue to use the storage
dashboard fragment for the internal storage, but for SD cards
and USB drives it makes sense to show the old view.

Bug: 34623728
Test: Manual
Change-Id: Ibe640decea6486a75034184c8f9f95bf00411553
2017-01-26 15:03:00 -08:00
Soroosh Mariooryad
b1922dbc39 Adding setting suggestion ranker.
Test: RunSettingsGoogleRoboTests
This is currently behind a flag and it is no-op CL.

Change-Id: Ieed3e5a9c3c2fbb0ce1bfea77c588b04778540eb
2017-01-26 14:45:39 -08:00
Salvador Martinez
d7fe1fb958 Fix null pointer exception when surveys are turned off
Under certain conditions the provider could be null on
download completion which could lead to a
NPE if surveys are disabled. The method to remove
the receiver has been made static so an instance
is no longer required.

Test: robotests
Bug: 33707203
Change-Id: Icfb545697f24172db734dd7dad421796edf68186
2017-01-26 12:32:21 -08:00
Pavlin Radoslavov
86c492ffcc Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa am: a53cc5068d am: e3fc5f7b56
am: fbdc22ff9a

Change-Id: I002e9ef05e3fa91b6430b1d31bc3178e87b097d0
2017-01-26 19:42:33 +00:00
Pavlin Radoslavov
fbdc22ff9a Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa am: a53cc5068d
am: e3fc5f7b56

Change-Id: I69b7cef21d953bcecd2fb73ddbc1b6231c4eb25b
2017-01-26 19:31:19 +00:00
Pavlin Radoslavov
e3fc5f7b56 Merge "Integration of the AAC codec for A2DP source" am: 6a153ac4aa
am: a53cc5068d

Change-Id: Iee8bf4a93a7c6879a144616648fd629c3109e40d
2017-01-26 19:25:49 +00:00
Pavlin Radoslavov
a53cc5068d Merge "Integration of the AAC codec for A2DP source"
am: 6a153ac4aa

Change-Id: I1ca21a7c2a2c2792ba3fa6055f767d3b8686f5d5
2017-01-26 19:20:20 +00:00
Robin Lee
2953f31b61 Prompt to start user before choosing a new ringtone
Dead users can't hear, nor see, ringtones. Let's wake them up and give
them a good shake first.

Until then, show a nice friendly "work profile isn't available" message.
Or depending on locale something confusing, egregious, and mismatched
like "work profile isn't available" instead.

Fix: 34735015
Bug: 34734809
Test: make RunSettingsRoboTests && make Settings && adb install -r $OUT/system/priv-app/Settings/Settings.apk && then reboot the device to see what happens
Change-Id: I86e61a7f3f654d7f38f04c43227a31e2f288e18f
2017-01-26 18:20:45 +00:00
songchenxi
b9cf917f40 Location Setting change for O
This is a change that adds a link from location settings to location
permissions

Test: Manual

Bug: 34400189
Change-Id: If873fbb6e53c1fd86a3cfe38e06465cdec56bef8
2017-01-26 09:33:26 -08:00
Pavlin Radoslavov
c0a3a9fb94 Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug: 30958229
Change-Id: Icef9ce9fb8e41cad65bc57bf078513d0c7bf7b9a
2017-01-26 09:30:11 -08:00
Lenka Trochtova
a2070edbf2 RequestPermissionHelperActivity: policy transparency for BT disallowed
Don't try to enable Bluetooth if it was disallowed, show a policy
transparency dialog instead.

Test: manual with CtsVerifier

Bug: 32895313

Change-Id: I9dd535a959b65f172cf2dcdd5483773d4f67366c
2017-01-26 15:44:55 +01:00