Commit Graph

15016 Commits

Author SHA1 Message Date
Mihai Niță
421c7d9832 Merge "Fix for Developer-Force RTL removing the locale list" 2017-02-02 17:13:07 +00:00
Pavlin Radoslavov
6e5f93c57a Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2 am: 33b4688634
am: 068780c052

Change-Id: I77cd63033413eadb4385d844bb2b83ef9dbef320
2017-02-02 16:55:48 +00:00
Pavlin Radoslavov
068780c052 Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc am: 0356b740f2
am: 33b4688634

Change-Id: I40314d5a74c7c8ede98666d708723f4b6df46165
2017-02-02 04:38:17 +00:00
Pavlin Radoslavov
33b4688634 Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings" am: 78115c0abc
am: 0356b740f2

Change-Id: I359020a85c6bc8a5201018f31f5f9fd274b2b94d
2017-02-02 04:35:49 +00:00
Pavlin Radoslavov
0356b740f2 Merge "Add missing null pointer check for Bluetooth A2DP Codec Settings"
am: 78115c0abc

Change-Id: I6e29cc46fb4577973b8e9d6b48a2c8ad48d5531a
2017-02-02 04:32:48 +00:00
Stephen Chen
a7b27b22b9 Hide ConfigureWifiPreference tiles behind Advanced
Also reordered the preferences.

Bug: 34889722
Test: manual inspection.
Change-Id: Ica2fda91e6fe98edae49bca687ebb2da83251770
2017-02-01 17:57:22 -08:00
Pavlin Radoslavov
789d21d475 Add missing null pointer check for Bluetooth A2DP Codec Settings
Bug: 34885602
Test: Code compilation
Change-Id: I13443390e7c6ffa34b5957a588fc0cefdf5b80f5
2017-02-01 17:43:23 -08:00
Daniel Nishi
58543f1dd4 Don't crash in Music Storage Settings.
This crash occurs because the music files entry is active, but does
not have an AppEntry (because it is not an app.) ManageApplications
assumes all active elements have an AppEntry, which causes an NPE.

By adding in a null check, we can avoid this.

Bug: 34888282
Test: Manual -- because ManageApplications needs refactoring badly.
Change-Id: Ief0c202f6176d90e492e62e5930b940e5a28b95c
2017-02-01 14:19:28 -08:00
Daniel Nishi
0905600b7a Use the fast track calculation for apps.
This replaces the calculation of the apps category
and add in a calculation for the games category using
the faster GID calculation. This should result in app
sizes loading roughly 10 times after.

Bug: 34204877
Test: Settings unit & robo tests
Change-Id: I78044a8d50f695f8c0a7e04183030232a9719260
2017-02-01 14:02:03 -08:00
Daniel Nishi
d1172942ee Merge "Add a music apps view to the Storage Settings." 2017-02-01 21:01:56 +00:00
Mihai Nita
efede41864 Fix for Developer-Force RTL removing the locale list
Bug: 34359287
Test: manual - added 3 locales, enabled RTL, and checked that the list did not change
Change-Id: I90753ab495fca24d2bfceed10dea363eb8d194a2
2017-02-01 11:45:53 -08:00
Christine Franks
91bd9f3072 DO NOT MERGE - Require password to FR in carrier demo mode
am: 22430d5abb

Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774
2017-02-01 19:14:41 +00:00
Christine Franks
22430d5abb DO NOT MERGE - Require password to FR in carrier demo mode
Bug: 34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.

Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16
2017-02-01 09:37:28 -08:00
Robin Lee
b5edf1a7a0 Merge "Fix 4 broken work profile tests" 2017-02-01 14:31:08 +00:00
Christine Franks
ff43d8f3b7 DO NOT MERGE - Allow FR in carrier demo mode
am: bb6859ca75

Change-Id: Ie0ff34a0b8a429caa5119c8bbc42de7b24f3b9ce
2017-02-01 02:16:17 +00:00
Phil Weaver
55cd7415e6 Merge "Optimize a11y service capabilities" 2017-02-01 02:01:49 +00:00
Christine Franks
bb6859ca75 DO NOT MERGE - Allow FR in carrier demo mode
Bug: 34341567
Test: manual - in carrier demo mode, go to Settings > Backup and
Reset > Factory data reset > Reset phone > Erase everything and
this entire path is viewable.

Change-Id: I373a2e94f205f6e6e4dd9a54dcf08532a64e5187
2017-02-01 00:37:45 +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
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
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
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
e2904eb7fa Fix null pointer exception when surveys are turned off
am: 9db3cb3bee

Change-Id: I9f71f40a715cfb65d8a5bc53fed64e674bd0515d
2017-01-27 20:03:08 +00:00
TreeHugger Robot
4edcb927ab Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev 2017-01-27 19:59:03 +00:00
Soroosh Mariooryad
729cfcbe4d Merge "Adding setting suggestion ranker." 2017-01-27 19:22:35 +00:00