OSDN Git Service
Pavlin Radoslavov [Tue, 31 Jan 2017 19:25:30 +0000 (19:25 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50 am:
96dda78d24 am:
6fbaebd7e8
am:
502de2cfa2
Change-Id: Ib894f4f4f2587cda27cdf6c4e3dba70a7fdbc0d0
Pavlin Radoslavov [Tue, 31 Jan 2017 19:18:46 +0000 (19:18 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50 am:
96dda78d24
am:
6fbaebd7e8
Change-Id: I677b6fdc1280337c5b383aa0e681cba44db23c94
Pavlin Radoslavov [Tue, 31 Jan 2017 19:13:20 +0000 (19:13 +0000)]
Merge "Update the A2DP Codec Config API" am:
bd298a7a50
am:
96dda78d24
Change-Id: I2cdd1e9117076b17fcf218e8f50a86d9c36b3474
Pavlin Radoslavov [Tue, 31 Jan 2017 19:08:11 +0000 (19:08 +0000)]
Merge "Update the A2DP Codec Config API"
am:
bd298a7a50
Change-Id: I5d3e3c0d3d6e3d679ad94779600a9e266f7f927b
Pavlin Radoslavov [Tue, 31 Jan 2017 19:02:35 +0000 (19:02 +0000)]
Merge "Update the A2DP Codec Config API"
Doris Ling [Tue, 31 Jan 2017 18:14:40 +0000 (18:14 +0000)]
Merge "Make UsersDashboardAlias primary profile controlled."
William Mee [Tue, 31 Jan 2017 16:54:44 +0000 (16:54 +0000)]
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."
Bill Yi [Tue, 31 Jan 2017 08:47:00 +0000 (08:47 +0000)]
Import translations. DO NOT MERGE am:
2a3b062c4a -s ours
am:
bb2a8f15cb -s ours
Change-Id: I41d1afe145de55b33b6b20db3392d99e3debed19
Bill Yi [Tue, 31 Jan 2017 08:42:59 +0000 (08:42 +0000)]
Import translations. DO NOT MERGE
am:
2a3b062c4a -s ours
Change-Id: Ic11826d8d728ca3324bd0bc75455ccf6fe7c3008
Bill Yi [Tue, 31 Jan 2017 07:10:41 +0000 (23:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
Stephen Chen [Tue, 31 Jan 2017 02:08:35 +0000 (02:08 +0000)]
Merge "Move AdvancedWifiSettings into ConfigureWifiSettings."
Pavlin Radoslavov [Sat, 28 Jan 2017 01:19:56 +0000 (17:19 -0800)]
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
Maurice Lam [Mon, 30 Jan 2017 23:52:25 +0000 (23:52 +0000)]
Merge "Suppress failing Settings Robolectric tests"
Stephen Chen [Thu, 26 Jan 2017 01:34:09 +0000 (17:34 -0800)]
Move AdvancedWifiSettings into ConfigureWifiSettings.
Bug:
34719854
Test: make -j40 RunSettingsRoboTests
clicked on preferences and made sure functionality did not change.
Change-Id: Ia5f0c7f5ea0f88d1322008ab58ca79028cc1a2bb
Julia Reynolds [Fri, 27 Jan 2017 13:51:23 +0000 (08:51 -0500)]
Show channel groups in settings.
Test: manual
Change-Id: Icfaed2d2d898245fcfa50b25d7ad456e4db07bae
Julia Reynolds [Mon, 30 Jan 2017 19:37:01 +0000 (19:37 +0000)]
Merge "Audio attributes"
Marie Janssen [Mon, 30 Jan 2017 18:21:05 +0000 (10:21 -0800)]
resolve merge conflicts of
1c98d85cf6 to master
Change-Id: Ie4401bf35d4a56865faa5476b86b2a384ad21231
Marie Janssen [Mon, 30 Jan 2017 18:02:01 +0000 (18:02 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am:
1ad23a71e4 am:
184506a710
am:
83fb10ae1e
Change-Id: Ib7a51c9cae91202087bfcc11e6eb18b219e84d36
Marie Janssen [Mon, 30 Jan 2017 17:57:11 +0000 (17:57 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver" am:
1ad23a71e4
am:
184506a710
Change-Id: I6114e7b4617e7f23373434a54672497654d6d786
Marie Janssen [Mon, 30 Jan 2017 17:51:50 +0000 (17:51 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
am:
1ad23a71e4
Change-Id: I045b82e81d1fdd3d8844efbd2c79d41fdd6d8aa6
Marie Janssen [Mon, 30 Jan 2017 17:46:17 +0000 (17:46 +0000)]
Merge "Bluetooth: remove BluetoothDiscoveryReceiver"
Anton Philippov [Mon, 30 Jan 2017 16:39:41 +0000 (16:39 +0000)]
Merge "Add a screen to show OEM backup settings."
Anton Philippov [Wed, 25 Jan 2017 20:37:36 +0000 (20:37 +0000)]
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
Nicolas Prévot [Mon, 30 Jan 2017 11:24:00 +0000 (11:24 +0000)]
Merge "Add policy transparency to Settings > device administrators"
Maurice Lam [Sat, 28 Jan 2017 04:37:40 +0000 (20:37 -0800)]
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
Daniel Nishi [Fri, 27 Jan 2017 22:57:33 +0000 (22:57 +0000)]
Merge "Go to the old storage settings when using non-internal storage."
Doris Ling [Fri, 27 Jan 2017 21:13:17 +0000 (13:13 -0800)]
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
TreeHugger Robot [Fri, 27 Jan 2017 20:49:03 +0000 (20:49 +0000)]
Merge "Move intent action to xml"
Salvador Martinez [Fri, 27 Jan 2017 20:37:29 +0000 (20:37 +0000)]
Merge "Remove fake data" into nyc-mr2-dev am:
d258b2f40f -s ours
am:
14db171c1b -s ours
Change-Id: I74408491dfeb629b39afa874fb166856a1d85f6e
Salvador Martinez [Fri, 27 Jan 2017 20:37:13 +0000 (20:37 +0000)]
Remove fake data am:
a1499c3005 -s ours
am:
a7b1c967b7 -s ours
Change-Id: If6738d1bba8dd8207b79c0082799ba24a09062f0
TreeHugger Robot [Fri, 27 Jan 2017 20:35:29 +0000 (20:35 +0000)]
Merge "modified settings to use settingslib class"
Salvador Martinez [Fri, 27 Jan 2017 20:34:41 +0000 (20:34 +0000)]
Merge "Remove fake data" into nyc-mr2-dev
am:
d258b2f40f -s ours
Change-Id: Ic418e0cbdd54679f0af152b13f52f34d963da8b6
Salvador Martinez [Fri, 27 Jan 2017 20:34:39 +0000 (20:34 +0000)]
Remove fake data
am:
a1499c3005 -s ours
Change-Id: Iea66d48fba72ff28bbc81a1499084a9afcd1e569
TreeHugger Robot [Fri, 27 Jan 2017 20:31:39 +0000 (20:31 +0000)]
Merge "Remove fake data" into nyc-mr2-dev
Julia Reynolds [Fri, 27 Jan 2017 20:18:51 +0000 (15:18 -0500)]
Audio attributes
Test: manual
Change-Id: I4f298019a42520370a3867e332274abe299cff2d
Salvador Martinez [Fri, 27 Jan 2017 20:05:17 +0000 (20:05 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev am:
4edcb927ab
am:
387fdd058e -s ours
Change-Id: I05efb9a970bbd055d37a7bcf7a204675109d4001
Salvador Martinez [Fri, 27 Jan 2017 20:05:09 +0000 (20:05 +0000)]
Fix null pointer exception when surveys are turned off am:
9db3cb3bee
am:
e2904eb7fa -s ours
Change-Id: I3ebd619327fa399e8fab9ead6e1de63a67ce1306
Salvador Martinez [Fri, 27 Jan 2017 20:03:12 +0000 (20:03 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
am:
4edcb927ab
Change-Id: I384020dab83593e815c0afc0d5c2657c9dcaacbc
Salvador Martinez [Fri, 27 Jan 2017 20:03:08 +0000 (20:03 +0000)]
Fix null pointer exception when surveys are turned off
am:
9db3cb3bee
Change-Id: I9f71f40a715cfb65d8a5bc53fed64e674bd0515d
TreeHugger Robot [Fri, 27 Jan 2017 19:59:03 +0000 (19:59 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
Soroosh Mariooryad [Fri, 27 Jan 2017 19:22:34 +0000 (19:22 +0000)]
Merge "Adding setting suggestion ranker."
songchenxi [Thu, 26 Jan 2017 21:10:50 +0000 (13:10 -0800)]
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
Salvador Martinez [Wed, 25 Jan 2017 22:56:03 +0000 (14:56 -0800)]
Remove fake data
Missed one location that adds fake data
to the payload the first time these were
removed. This patch removes any remaining
fake data being attached to a survey payload.
Test: Robotests still pass
Bug:
34716378
Change-Id: Iccb60ce24ae5c494dcd287107f8d293f4a56b2d5
Merged-In: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
Salvador Martinez [Tue, 24 Jan 2017 23:16:52 +0000 (15:16 -0800)]
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
Sunny Goyal [Fri, 27 Jan 2017 17:59:54 +0000 (17:59 +0000)]
Merge "Passing bind options to the service in the bind-widget permission prompt"
Robin Lee [Fri, 27 Jan 2017 14:03:12 +0000 (14:03 +0000)]
Merge "Prompt to start user before choosing a new ringtone"
Andrew Sapperstein [Fri, 27 Jan 2017 03:43:44 +0000 (03:43 +0000)]
Merge "Finalize string for usage alerts." into nyc-mr2-dev am:
f15b23ad65
am:
718de5da30
Change-Id: I09589fddda36e95cd99993383c7ab427b8bc6d9e
Andrew Sapperstein [Fri, 27 Jan 2017 03:41:44 +0000 (03:41 +0000)]
Merge "Finalize string for usage alerts." into nyc-mr2-dev
am:
f15b23ad65
Change-Id: I2db7aa3136facd9841c52e6c79e38fd140b41df1
Andrew Sapperstein [Fri, 27 Jan 2017 03:41:44 +0000 (03:41 +0000)]
Finalize string for usage alerts. am:
59fd24cde2
am:
251c91d974
Change-Id: I90392ba7d7cd1c3ac47c925dfb6cdcea8325ec53
Andrew Sapperstein [Fri, 27 Jan 2017 03:39:48 +0000 (03:39 +0000)]
Finalize string for usage alerts.
am:
59fd24cde2
Change-Id: I79519e4c1f04dd2eee32320b4d8c4482fd4f2830
TreeHugger Robot [Fri, 27 Jan 2017 03:37:44 +0000 (03:37 +0000)]
Merge "Finalize string for usage alerts." into nyc-mr2-dev
TreeHugger Robot [Fri, 27 Jan 2017 03:28:57 +0000 (03:28 +0000)]
Merge "Fix null pointer exception when surveys are turned off"
Andrew Sapperstein [Fri, 27 Jan 2017 01:30:30 +0000 (17:30 -0800)]
Finalize string for usage alerts.
Test: manual
Bug:
34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
Marie Janssen [Tue, 24 Jan 2017 22:21:29 +0000 (14:21 -0800)]
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
Daniel Nishi [Wed, 25 Jan 2017 19:47:28 +0000 (11:47 -0800)]
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
Soroosh Mariooryad [Wed, 18 Jan 2017 02:19:41 +0000 (18:19 -0800)]
Adding setting suggestion ranker.
Test: RunSettingsGoogleRoboTests
This is currently behind a flag and it is no-op CL.
Change-Id: Ieed3e5a9c3c2fbb0ce1bfea77c588b04778540eb
Salvador Martinez [Sat, 17 Dec 2016 01:34:11 +0000 (17:34 -0800)]
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
Pavlin Radoslavov [Thu, 26 Jan 2017 19:42:33 +0000 (19:42 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
6a153ac4aa am:
a53cc5068d am:
e3fc5f7b56
am:
fbdc22ff9a
Change-Id: I002e9ef05e3fa91b6430b1d31bc3178e87b097d0
Pavlin Radoslavov [Thu, 26 Jan 2017 19:31:19 +0000 (19:31 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
6a153ac4aa am:
a53cc5068d
am:
e3fc5f7b56
Change-Id: I69b7cef21d953bcecd2fb73ddbc1b6231c4eb25b
Pavlin Radoslavov [Thu, 26 Jan 2017 19:25:49 +0000 (19:25 +0000)]
Merge "Integration of the AAC codec for A2DP source" am:
6a153ac4aa
am:
a53cc5068d
Change-Id: Iee8bf4a93a7c6879a144616648fd629c3109e40d
Pavlin Radoslavov [Thu, 26 Jan 2017 19:20:20 +0000 (19:20 +0000)]
Merge "Integration of the AAC codec for A2DP source"
am:
6a153ac4aa
Change-Id: I1ca21a7c2a2c2792ba3fa6055f767d3b8686f5d5
Treehugger Robot [Thu, 26 Jan 2017 19:12:54 +0000 (19:12 +0000)]
Merge "Integration of the AAC codec for A2DP source"
Robin Lee [Thu, 26 Jan 2017 18:14:08 +0000 (18:14 +0000)]
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
songchenxi [Thu, 19 Jan 2017 04:16:57 +0000 (20:16 -0800)]
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
Pavlin Radoslavov [Sat, 14 Jan 2017 08:50:59 +0000 (00:50 -0800)]
Integration of the AAC codec for A2DP source
Test: A2DP streaming to AAC headsets
Bug:
30958229
Change-Id: Icef9ce9fb8e41cad65bc57bf078513d0c7bf7b9a
Lenka Trochtova [Thu, 26 Jan 2017 14:34:52 +0000 (15:34 +0100)]
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
Nicolas Prevot [Tue, 24 Jan 2017 14:29:59 +0000 (14:29 +0000)]
Add policy transparency to Settings > device administrators
In Settings > device administrators: if the user wants to remove
a work profile but DISALLOW_REMOVE_MANAGED_PROFILE is set: show
policy transparency.
BUG:
33925172
BUG:
34455202
Test: manual
Change-Id: Ifbb9806e92e759039d592af29568bffce5fbb92a
Stefano Tommasini [Thu, 26 Jan 2017 10:38:52 +0000 (10:38 +0000)]
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev am:
a04697a951
am:
3e7287b6db -s ours
Change-Id: I3d9af498968a614de17928cf9dca25da7d6e23a8
Stefanot [Thu, 26 Jan 2017 10:38:45 +0000 (10:38 +0000)]
*DO NOT MERGE* Create new suggestion category for backup. am:
1c72ce06d1
am:
3c019a8714 -s ours
Change-Id: I96f27a8f2afd65784de9289daff082ab5914fbb8
Stefano Tommasini [Thu, 26 Jan 2017 10:36:06 +0000 (10:36 +0000)]
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
am:
a04697a951
Change-Id: I9f5c2efb755e6e96805be3feb97f85dc0f4a0ce0
Stefanot [Thu, 26 Jan 2017 10:35:45 +0000 (10:35 +0000)]
*DO NOT MERGE* Create new suggestion category for backup.
am:
1c72ce06d1
Change-Id: I07d65c9045c97ac62e4d7bfc0fd96a92fdab5809
Stefano Tommasini [Thu, 26 Jan 2017 10:31:14 +0000 (10:31 +0000)]
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
Steven Moreland [Thu, 26 Jan 2017 10:09:55 +0000 (10:09 +0000)]
Merge "Development Options: toggle binderized hals" am:
5f854f39a8 am:
8076dcde0c am:
ec0e1fb59f
am:
7ea5b6d740
Change-Id: I2c9d79da43142e440f7c79b85904a94c2af65b76
Steven Moreland [Thu, 26 Jan 2017 10:06:43 +0000 (10:06 +0000)]
Merge "Development Options: toggle binderized hals" am:
5f854f39a8 am:
8076dcde0c
am:
ec0e1fb59f
Change-Id: I7bb618cdbe0bc925b214b9184652864ad6b5a8ba
Steven Moreland [Thu, 26 Jan 2017 10:03:46 +0000 (10:03 +0000)]
Merge "Development Options: toggle binderized hals" am:
5f854f39a8
am:
8076dcde0c
Change-Id: Idb3f71707b7b1b091e3a18517852fff66e01cf08
Steven Moreland [Thu, 26 Jan 2017 10:01:15 +0000 (10:01 +0000)]
Merge "Development Options: toggle binderized hals"
am:
5f854f39a8
Change-Id: Id05768135b0609e917f4e1888caf2724ebf9ba3a
Treehugger Robot [Thu, 26 Jan 2017 09:57:38 +0000 (09:57 +0000)]
Merge "Development Options: toggle binderized hals"
Bill Yi [Thu, 26 Jan 2017 07:14:12 +0000 (07:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
063b543124 -s ours
am:
398db3e566 -s ours
Change-Id: I43ce9c2d751cd9ce0ea8a69b3539a11626226cad
Bill Yi [Thu, 26 Jan 2017 07:13:58 +0000 (07:13 +0000)]
Import translations. DO NOT MERGE am:
db68fc320f -s ours
am:
b33b8c9081 -s ours
Change-Id: I06f626486bc7c15d769a30e1111cd4bf82740915
Bill Yi [Thu, 26 Jan 2017 07:11:30 +0000 (07:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
063b543124 -s ours
Change-Id: I5ab2b1d1e9767e94d0aea73c51d3bc12f151184a
Bill Yi [Thu, 26 Jan 2017 07:11:29 +0000 (07:11 +0000)]
Import translations. DO NOT MERGE
am:
db68fc320f -s ours
Change-Id: I178cf3af6e91249aed1ed457bcbc88eb2d7f86f1
TreeHugger Robot [Thu, 26 Jan 2017 07:06:17 +0000 (07:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Steven Moreland [Fri, 13 Jan 2017 19:31:41 +0000 (11:31 -0800)]
Development Options: toggle binderized hals
This allows for quick performance testing and also for a better
dogfooding experience.
Bug:
34256441
Test: Verification with getprop.
Change-Id: I81c5e0b1044d4569a6fe55a4b30f7e21c4465fc2
Bill Yi [Thu, 26 Jan 2017 04:04:52 +0000 (20:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibb3ccac189513a5a988ec8c857f2ad574371808a
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 26 Jan 2017 02:09:52 +0000 (02:09 +0000)]
Merge "Update Network & internet->Wi-Fi to use MasterSwitchPreference."
Doris Ling [Thu, 26 Jan 2017 01:50:22 +0000 (01:50 +0000)]
Merge "Revert "Get intent for backup settings from backup transport.""
William Mee [Wed, 25 Jan 2017 21:10:11 +0000 (13:10 -0800)]
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.
ag/
1829150 has the corresponding Settings.Global change.
Bug:
34052475
Test: compiles
Change-Id: I529d778537cc418f44616384ecde4a03bcd2e117
Fan Zhang [Thu, 26 Jan 2017 01:05:31 +0000 (01:05 +0000)]
Revert "Get intent for backup settings from backup transport."
Bug:
34700410
This reverts commit
970a66c97298ec1ec7abd874eaa82787b65a8fa6.
Change-Id: I254d704eb4f456c07c6d6d270de830aef95d1f4a
TreeHugger Robot [Thu, 26 Jan 2017 01:10:15 +0000 (01:10 +0000)]
Merge "Implements queryNonIndexableKeys for Settings"
Shahriyar Amini [Thu, 26 Jan 2017 00:48:18 +0000 (00:48 +0000)]
Merge "Create security status preference category."
Chao Chen [Thu, 26 Jan 2017 00:18:32 +0000 (00:18 +0000)]
Merge "Integrate Select-To-Speak in Vision Settings."
Daniel Nishi [Wed, 25 Jan 2017 22:52:35 +0000 (22:52 +0000)]
Merge "Add an automated test for the null bundle crash."
Matthew Fritze [Tue, 24 Jan 2017 18:45:11 +0000 (10:45 -0800)]
Implements queryNonIndexableKeys for Settings
queryNonIndexableKeys returns a list of all of the
non-indexable keys for all providers in Settings
Change-Id: Id53cb2f55662e85c66f1c3f0c0e7d933b19fedaf
Fixes:
34623460
Test: RunSettingsRoboTests
Shahriyar Amini [Tue, 24 Jan 2017 04:27:34 +0000 (20:27 -0800)]
Create security status preference category.
Bug:
31002801
Test: make RunSettingsRoboTests
Change-Id: I513253e79f91e41686bad9abac8548bb366fc98d
Jerry Zhang [Wed, 25 Jan 2017 21:35:40 +0000 (21:35 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev am:
361a3e2090
am:
8b6614cdc3
Change-Id: I3162421f2f3e5a6237166d200feb7f954968f9f1
Jerry Zhang [Wed, 25 Jan 2017 21:33:23 +0000 (21:33 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
am:
361a3e2090
Change-Id: Idd44b8b05758f3fd8c2e016604c0f2a10bd0b80c
Jerry Zhang [Wed, 25 Jan 2017 21:32:25 +0000 (21:32 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method am:
a291336bd8 -s ours
am:
a0b75ff516
Change-Id: I56296cc7b7c2febd049b0a02865735ad7868bda6
Jerry Zhang [Wed, 25 Jan 2017 21:24:02 +0000 (21:24 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method
am:
a291336bd8 -s ours
Change-Id: I60a407b71c4fbf4b5bd0ef980c08af8a4aa68f20
chchao [Fri, 20 Jan 2017 22:45:32 +0000 (14:45 -0800)]
Integrate Select-To-Speak in Vision Settings.
This allows users to launch Select to Speak service in SetupWizard when
setting up their devices.
Bug:
29517229
Test: manual
Change-Id: I3844e2692e1fc9eb3d0736feb4ca4f74d474130b
TreeHugger Robot [Wed, 25 Jan 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Search only matches prefixes rather than any substring"