Commit Graph

33929 Commits

Author SHA1 Message Date
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
TreeHugger Robot
0d07305ca0 Merge "Change launcher icons to MaskableIconDrawable Test: manual test" 2017-02-01 18:57:54 +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
Rubin Xu
79b4ebffeb Deprecate old LockPatternUtils.clearLock()
New clearLock() requires current password to be supplied

Test: (depends on escrow token CL), add escrow token, clear lockscreen;
      verify escrow token is still usable.
Bug: 33126414
Change-Id: Ib248ee2ba8fa2743b038091253fd41401cfa3579
2017-02-01 14:15:06 +00:00
Christine Franks
9c2979e214 DO NOT MERGE - Allow FR in carrier demo mode am: bb6859ca75
am: ff43d8f3b7  -s ours

Change-Id: I416b536cca27965db44c4154db580651699588e8
2017-02-01 02:18:40 +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
Hyunyoung Song
a8bd6c1bb8 Change launcher icons to MaskableIconDrawable
Test: manual test

b/34853793

Change-Id: I3376c03e84a0a9d94190b930f16596b3e48e9a9d
2017-01-31 17:57:33 -08:00
TreeHugger Robot
cebd60f3b3 Merge "Increase character limit for a string" 2017-02-01 01:26:00 +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
Doris Ling
7a76e9493f Specify the fragment to launch when default home is clicked.
Add the fragment attribute to the default home preference so that it
will launch the DefaultHomePicker when it is clicked.

Change-Id: I6a06dc2fab6a4a5b8bae4e9ec0144e18d2934666
Fixes: 34795157
Test: make SettingsTests and run test
2017-01-31 13:35:47 -08: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
Julia Reynolds
37326a6023 Merge "Fix notification assistant setting" 2017-01-31 20:46:18 +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
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