OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb...
Jian Zhou [Thu, 27 Jul 2017 18:26:35 +0000 (18:26 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb am: 3aee5e1ad0
am: 86535a3d15

Change-Id: Ia6f34a3cf6e9b64669ca494c5088791ae5021092

6 years agoMerge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f
Ryusuke Sawa [Thu, 27 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f
am: 6b46a9df49

Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469

6 years agoMerge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb
Jian Zhou [Thu, 27 Jul 2017 18:24:10 +0000 (18:24 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb
am: 3aee5e1ad0

Change-Id: I2b3686a91254fd6f0a1050cf8be68304a70a03f5

6 years agoMerge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a
Ryusuke Sawa [Thu, 27 Jul 2017 18:23:51 +0000 (18:23 +0000)]
Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a
am: b0e008841f

Change-Id: I31f65d59a105db0fc49e73c4e3d7005d0102906d

6 years agoMerge "Settings: Fix SparseArray null pointer issue in monkey issues"
Jian Zhou [Thu, 27 Jul 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am: 41b4d908bb

Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a

6 years agoMerge "Show Error dialog when WPS is interrupted"
Ryusuke Sawa [Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3

6 years agoMerge "Don't update the header when toggle menu" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 18:21:16 +0000 (18:21 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
am: 4ab4966e7a

Change-Id: I323a94bc867d7575bd7ec7e34c506dd8e78ec2d1

6 years agoMerge "Settings: Fix SparseArray null pointer issue in monkey issues"
Treehugger Robot [Thu, 27 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"

6 years agoMerge "Don't update the header when toggle menu" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 18:15:55 +0000 (18:15 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev

6 years agoMerge "Show Error dialog when WPS is interrupted"
Treehugger Robot [Thu, 27 Jul 2017 18:15:35 +0000 (18:15 +0000)]
Merge "Show Error dialog when WPS is interrupted"

6 years agoMerge "Update suggestion ranking model coefficients." into oc-dr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 17:54:46 +0000 (17:54 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am: c3bb4cd8c0

Change-Id: Iad0b750eaaee29a41be6514cc29d521bc899b71a

6 years agoMerge "Update suggestion ranking model coefficients." into oc-dr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 17:39:04 +0000 (17:39 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev

6 years agoMerge "Revert string change" into oc-dr1-dev
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5

Change-Id: I0dbd3d1d3efd494ef592ee1fca201bedbcea881a

6 years agoMerge "Revert string change" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 12:36:55 +0000 (12:36 +0000)]
Merge "Revert string change" into oc-dr1-dev

6 years agoUpdate suggestion ranking model coefficients.
Soroosh Mariooryad [Thu, 27 Jul 2017 00:51:19 +0000 (17:51 -0700)]
Update suggestion ranking model coefficients.

- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.

Test: RunSettingsRoboTests & also manually testing suggestions
Bug: 64093782

Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64

6 years agoMerge "Add ambient notifications as inline setting." into oc-dr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:58 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am: 3bd56d970d

Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf

6 years agoMerge "Add ambient notifications as inline setting." into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 05:37:49 +0000 (05:37 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev

6 years agoShow Error dialog when WPS is interrupted
Ryusuke Sawa [Fri, 19 Jul 2013 05:32:19 +0000 (14:32 +0900)]
Show Error dialog when WPS is interrupted

When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77

6 years agoImport translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
Bill Yi [Thu, 27 Jul 2017 01:24:51 +0000 (01:24 +0000)]
Import translations. DO NOT MERGE am: 05185952c8  -s ours am: 64ce525c6a  -s ours
am: e3e1e7b9d4  -s ours

Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3

6 years agoMerge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 01:20:05 +0000 (01:20 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am: 7b445d59ef

Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be

6 years agoImport translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
Bill Yi [Thu, 27 Jul 2017 01:10:19 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am: 05185952c8  -s ours am: 64ce525c6a  -s ours
am: b0126e3500  -s ours

Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00

6 years agoMerge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
Matthew Fritze [Thu, 27 Jul 2017 01:09:55 +0000 (01:09 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d

6 years agoMerge "Set minLines for battery header text" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 01:08:43 +0000 (01:08 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e

6 years agoMerge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 01:01:26 +0000 (01:01 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE am: 05185952c8 -s ours
Bill Yi [Thu, 27 Jul 2017 00:55:57 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am: 05185952c8  -s ours
am: 64ce525c6a  -s ours

Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963

6 years agoImport translations. DO NOT MERGE am: 05185952c8 -s ours
Bill Yi [Thu, 27 Jul 2017 00:55:32 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am: 05185952c8  -s ours
am: 64ce525c6a  -s ours

Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620

6 years agoFix more config_headlineFontFamily-induced test breakages
Andrew Sapperstein [Thu, 27 Jul 2017 00:41:48 +0000 (17:41 -0700)]
Fix more config_headlineFontFamily-induced test breakages

Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests

6 years agoMerge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev

6 years agoMerge "Set minLines for battery header text" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]
Import translations. DO NOT MERGE
am: 05185952c8  -s ours

Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379

6 years agoDon't update the header when toggle menu
jackqdyulei [Wed, 26 Jul 2017 20:50:43 +0000 (13:50 -0700)]
Don't update the header when toggle menu

If we only toggle the app type in battery settings, don't update
the header. Then it won't have flicker in battery header.

Bug: 64065456
Test: RunSettingsRoboTest
Change-Id: If1cfa745f723f808ad9c5fd921be797acd3199ba

6 years agoMerge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
Ajay Nadathur [Wed, 26 Jul 2017 22:02:05 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39

6 years agoMerge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev

6 years agoAdd ambient notifications as inline setting.
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.

Bug: 62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb

6 years agoChange SwipeForNotification Payload default to Off
Matthew Fritze [Wed, 26 Jul 2017 19:59:50 +0000 (12:59 -0700)]
Change SwipeForNotification Payload default to Off

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee

6 years agoSet minLines for battery header text
jackqdyulei [Wed, 26 Jul 2017 18:24:54 +0000 (11:24 -0700)]
Set minLines for battery header text

So the header won't grow/shrink when the text changes.

Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 17:04:23 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df  -s ours

Change-Id: I8b980099381db8f56e3a339dfe497cce93595674

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 14:32:24 +0000 (07:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Allow open password dialog for wrong-password wifi access points" into oc...
Antony Sargent [Wed, 26 Jul 2017 11:12:39 +0000 (11:12 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4

Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25

6 years agoMerge "Allow open password dialog for wrong-password wifi access points" into oc...
TreeHugger Robot [Wed, 26 Jul 2017 10:53:30 +0000 (10:53 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE am: 8a25fb603a -s ours
Bill Yi [Wed, 26 Jul 2017 08:24:19 +0000 (08:24 +0000)]
Import translations. DO NOT MERGE am: 8a25fb603a  -s ours
am: 0c3ee7c15d  -s ours

Change-Id: Id2a54f2d8f8dd4a0558b95bf70f9ccd36c8d70b5

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 08:06:13 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE
am: 8a25fb603a  -s ours

Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f

6 years agoImport translations. DO NOT MERGE am: 8a25fb603a -s ours
Bill Yi [Wed, 26 Jul 2017 08:03:05 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am: 8a25fb603a  -s ours
am: 9d7971905c  -s ours

Change-Id: I7f2e3e064028eb5634b3896ea24cee481d6e3c88

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 07:59:05 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am: 8a25fb603a  -s ours

Change-Id: If4a3775dac048d13e739174b79415cf025bd4454

6 years agoAllow open password dialog for wrong-password wifi access points
Antony Sargent [Tue, 18 Jul 2017 22:33:18 +0000 (15:33 -0700)]
Allow open password dialog for wrong-password wifi access points

When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.

Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:

-The TestAccessPointBuilder class wasn't being found at runtime because
 it was getting stripped out at build time due to not being used in
 settings.

-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
 asserting that we don't end up with multiple entries for the same SSID
 in the access point list when changing the security state for the AP,
 but it was accidentally passing multiple AP's with the same name the
 first time.

Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78

6 years agoMerge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
Jack He [Wed, 26 Jul 2017 06:34:29 +0000 (06:34 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09

Change-Id: I6f9494b049d3e366c96edb60686fc8622c8b76d6

6 years agoMerge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 06:28:44 +0000 (06:28 +0000)]
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev

6 years agoMerge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
Doris Ling [Wed, 26 Jul 2017 06:23:08 +0000 (06:23 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
am: 4906a2a38a

Change-Id: Ie5ad8d1e5a943f2d3f878ad6f30ac1f56c80085d

6 years agoMerge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 06:11:07 +0000 (06:11 +0000)]
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev

6 years agoMerge "Extract method to build preference count logging's name." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 06:07:30 +0000 (06:07 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
am: 5fb56c5b37

Change-Id: Id4ae064a804b649b431913f02bde26013c1c87c2

6 years agoMerge "Extract method to build preference count logging's name." into oc-dr1-dev
Fan Zhang [Wed, 26 Jul 2017 05:59:57 +0000 (05:59 +0000)]
Merge "Extract method to build preference count logging's name." into oc-dr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:25:48 +0000 (21:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Restrict changing wi-fi networks" into oc-dr1-dev
Christine Franks [Wed, 26 Jul 2017 02:56:36 +0000 (02:56 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316

Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003

6 years agoMerge "Restrict changing wi-fi networks" into oc-dr1-dev
Christine Franks [Wed, 26 Jul 2017 02:38:08 +0000 (02:38 +0000)]
Merge "Restrict changing wi-fi networks" into oc-dr1-dev

6 years agoMerge "Add divider line below "see all apps" preference" into oc-dr1-dev
Doris Ling [Wed, 26 Jul 2017 02:08:44 +0000 (02:08 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92

Change-Id: I80aee4e13aff91ac66309df438511826a2b75187

6 years agoMerge "Add divider line below "see all apps" preference" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 02:02:32 +0000 (02:02 +0000)]
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev

6 years agoMerge "Add default value to inline payloads" into oc-dr1-dev
Matthew Fritze [Wed, 26 Jul 2017 01:57:29 +0000 (01:57 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev
am: 5aca5f3aec

Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3

6 years agoMerge "Add default value to inline payloads" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 01:52:38 +0000 (01:52 +0000)]
Merge "Add default value to inline payloads" into oc-dr1-dev

6 years agoBluetooth: reset mConnectionState when adapter is OFF
Jack He [Tue, 25 Jul 2017 21:50:11 +0000 (14:50 -0700)]
Bluetooth: reset mConnectionState when adapter is OFF

* No device is connected when Bluetooth adapter is OFF
* BluetoothSummaryUpdater should reset its connection state tracker in
  order to display the correct summary message on ConnectedDevice
  preference
* Otherwise, "Connected to null" will be shown because no device is
  connected while BluetoothSummaryUpdater is still in CONNECTED state
* Removed unused imports from BluetoothSummaryUpdater
* Write additional unit test to verify the above behaviour
* Add additional logging when deviceName is null in CONNECTED state

Bug: 62492716
Test: Pair and connect to Bluetooth device, turning Bluetooth ON/OFF,
      unit tests
Change-Id: I30726636f5678d61d6052f5b8d211aa20f26f409

6 years agoMerge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 23:51:03 +0000 (23:51 +0000)]
Merge "Fix robotests." into oc-dr1-dev
am: b5696a9162

Change-Id: I126be625a1b9114ca067dca0f2fe99c7aa395873

6 years agoExtract method to build preference count logging's name.
Fan Zhang [Mon, 24 Jul 2017 23:03:49 +0000 (16:03 -0700)]
Extract method to build preference count logging's name.

Bug: 35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9

6 years agoDisable Wallpaper setting when Wallpaper is disabled.
Doris Ling [Mon, 24 Jul 2017 20:13:00 +0000 (13:13 -0700)]
Disable Wallpaper setting when Wallpaper is disabled.

Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I85fb90ad783e5be008c9343a0804893604814bd1
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Merged-In: I1afba6639a2b94f9d57f546c220f417092f92387
Fix: 63939450
Test: make RunSettingsRoboTests

6 years agoMerge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 23:37:37 +0000 (23:37 +0000)]
Merge "Fix robotests." into oc-dr1-dev

6 years agoMerge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 23:30:32 +0000 (23:30 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
am: 5b67e453bf

Change-Id: I7694793ff006a2c677511563b69e411b6ed284f2

6 years agoMerge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 23:21:48 +0000 (23:21 +0000)]
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev

6 years agoAdd default value to inline payloads
Matthew Fritze [Mon, 24 Jul 2017 21:58:36 +0000 (14:58 -0700)]
Add default value to inline payloads

If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Change-Id: I8a593d9ff3308b2d0cd5bc65658d160abf55b07e
Fixes: 63955012
Test: robotests

6 years agoMerge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
Fan Zhang [Tue, 25 Jul 2017 21:30:26 +0000 (21:30 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am: 6ef56e43ee

Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f

6 years agoMerge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
TreeHugger Robot [Tue, 25 Jul 2017 21:23:19 +0000 (21:23 +0000)]
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev

6 years agoMerge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
Roshan Pius [Tue, 25 Jul 2017 21:01:43 +0000 (21:01 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
am: 2b689e63ca

Change-Id: I39ee1e7e6712e6acec56aaa088ef19ea2669784c

6 years agoMerge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
Lei Yu [Tue, 25 Jul 2017 20:55:21 +0000 (20:55 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
am: 5963ffd4e3

Change-Id: I71b5405e87c0ad7833eb8aa6cc8cbd6dfc0420bb

6 years agoMerge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
Roshan Pius [Tue, 25 Jul 2017 20:52:29 +0000 (20:52 +0000)]
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev

6 years agoFix robotests.
Andrew Sapperstein [Tue, 25 Jul 2017 18:01:23 +0000 (11:01 -0700)]
Fix robotests.

Couldn't find config_headlineFontFamily. Added some
SettingsShadowResources.overrideResource calls.

Change-Id: I7179475df649b7a053deb0fa20e4c6c33f6a8acd
Merged-In: I13f5b5dd6b97057e7f77cc4d15abdb6451314b50
Fixes: 64024743
Test: robotests

6 years agoMerge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
Lei Yu [Tue, 25 Jul 2017 20:48:02 +0000 (20:48 +0000)]
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev

6 years agoRestrict changing wi-fi networks
Christine Franks [Wed, 12 Jul 2017 00:32:57 +0000 (17:32 -0700)]
Restrict changing wi-fi networks

Bug: 31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928

6 years agoRevert string change
Julia Reynolds [Tue, 25 Jul 2017 18:46:10 +0000 (14:46 -0400)]
Revert string change

Test: manual
Change-Id: I3f38ac68ae6b9fc225c92bdfcc0f79859ff8dfa1
Fixes: 63906381

6 years agoAdd anomaly detection method to AnomalyUtils
jackqdyulei [Fri, 21 Jul 2017 19:18:33 +0000 (12:18 -0700)]
Add anomaly detection method to AnomalyUtils

So we could reuse it in different loaders.

Bug: 63900914
Test: robotests still pass
Change-Id: I038085f53b9d0a05b8c4849c7544567434885821

6 years agosettings(manifest): Add NETWORK_SETTINGS permission
Roshan Pius [Mon, 24 Jul 2017 22:05:36 +0000 (15:05 -0700)]
settings(manifest): Add NETWORK_SETTINGS permission

This is needed for invoking some wifi/connectivity API's. For example,
we switched over using this permission to determine if an app is allowed
to modify any saved wifi network configuration on the device.

Bug: 64001841
Test: Able to forget networks created by SetupWizard.
Change-Id: I932226a74b12bf726a2445188953b1ec34523cf9
Merged-In: I932226a74b12bf726a2445188953b1ec34523cf9

6 years agoMerge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
Bartosz Fabianowski [Tue, 25 Jul 2017 10:18:41 +0000 (10:18 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
am: 262aacd353

Change-Id: I24ffc75897c92124cf9416ea79ff4c704a733c0e

6 years agoMerge "Fix "max failed login attempts" disclosure" into oc-dr1-dev
Bartosz Fabianowski [Tue, 25 Jul 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Fix "max failed login attempts" disclosure" into oc-dr1-dev

6 years agoMerge "Fingerprint swipe settings and suggestions should not show if hardware unavail...
Kevin Chyn [Tue, 25 Jul 2017 05:36:32 +0000 (05:36 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev
am: 5e707ccb3d

Change-Id: Ib988ae3439dbbaed2c84d906b6e88412ce27461f

6 years agoMerge "Fingerprint swipe settings and suggestions should not show if hardware unavail...
Kevin Chyn [Tue, 25 Jul 2017 05:31:53 +0000 (05:31 +0000)]
Merge "Fingerprint swipe settings and suggestions should not show if hardware unavailable" into oc-dr1-dev

6 years agoFingerprint swipe settings and suggestions should not show if hardware unavailable
Kevin Chyn [Thu, 20 Jul 2017 07:15:44 +0000 (00:15 -0700)]
Fingerprint swipe settings and suggestions should not show if hardware unavailable

Fixes: 63589121

Test: remove FP driver, make sure swipe setting and suggestions
don't show anymore && make -j RunSettingsRoboTests

Merged-In: I2539128daff8df52d040606141f772fc9edffa57
Change-Id: I2539128daff8df52d040606141f772fc9edffa57

6 years agoDefault-off FP Swipe
Kevin Chyn [Tue, 25 Jul 2017 01:07:31 +0000 (01:07 +0000)]
Default-off FP Swipe
am: 8f5de15ba1

Change-Id: Ie575c4a6335b83b00d8f2614bba532843a88534d

7 years agoDefault-off FP Swipe
Kevin Chyn [Mon, 24 Jul 2017 21:00:18 +0000 (14:00 -0700)]
Default-off FP Swipe

Fixes: 63992836

Test: adb shell settings delete secure system_navigation_keys_enabled
&& make -j RunSettingsRoboTests

Change-Id: I3245c7b8844df5edaea311c1871b1dd05b8b7784

7 years agoMake AirplaneModePrefController.isAvailable static.
Andrew Sapperstein [Mon, 24 Jul 2017 20:42:19 +0000 (13:42 -0700)]
Make AirplaneModePrefController.isAvailable static.

Allows calling without instantiating the pref controller.
Also some minor cleanup of MobileNetworkPrefController.

Bug: 62022517
Test: robotests
Change-Id: I34ff5d3729d06158bff3cc125de4c114bf4861d5

7 years agoFix search indexing for encryption_and_credential page
Fan Zhang [Sat, 22 Jul 2017 00:51:47 +0000 (17:51 -0700)]
Fix search indexing for encryption_and_credential page

- Rewrite search index provider to include all possible keys through
  getXmlResourcesToIndex()
- Add isPageSearchEnabled() to disable all keys if user is not admin
- Add getNonIndexableKeys to suppress unrelated keys based on current
  device state

Change-Id: I2c6943483789bf4c9f3931d344cf279fec0edaee
Fix: 37650170
Test: robotests

7 years agoUse fingerprint icons during setupwizard flow
Ajay Nadathur [Fri, 21 Jul 2017 22:11:21 +0000 (15:11 -0700)]
Use fingerprint icons during setupwizard flow

Use fingerprint icon when lock screens are loaded on
fingerprint setup's behalf.

bug: 63809908
Test: Manually tested and verified. Also added robolectric tests
Change-Id: I773a1eec2466e7ab626cc3330f5ce987a21b048f

7 years agoMerge "Add log for anomaly." into oc-dr1-dev
Lei Yu [Mon, 24 Jul 2017 18:07:13 +0000 (18:07 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev
am: 6666bf5605

Change-Id: I7ca4b466c6f175192bebb2b9a7807ebf783a249e

7 years agoMerge "Add log for anomaly." into oc-dr1-dev
Lei Yu [Mon, 24 Jul 2017 17:56:35 +0000 (17:56 +0000)]
Merge "Add log for anomaly." into oc-dr1-dev

7 years agoAdd ResultPayload for always-on ambient display.
Andrew Sapperstein [Mon, 24 Jul 2017 17:34:10 +0000 (17:34 +0000)]
Add ResultPayload for always-on ambient display.
am: eb1a45b95b

Change-Id: Ie00201adc19b7da516e3bb64fe857a17f8282d28

7 years agoAdd ResultPayload for always-on ambient display.
Andrew Sapperstein [Sat, 22 Jul 2017 23:22:49 +0000 (16:22 -0700)]
Add ResultPayload for always-on ambient display.

Bug: 62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838

7 years agoMerge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
Fan Zhang [Sat, 22 Jul 2017 17:59:38 +0000 (17:59 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
am: 6fcc38975c

Change-Id: Iacb3b689d1099bb12e43ff42e2f17166428ddfc5

7 years agoMerge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 17:54:31 +0000 (17:54 +0000)]
Merge "Reindex db when package w/ searchIndexProvider changes" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 22 Jul 2017 16:32:30 +0000 (16:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 4d7111b0e9  -s ours

Change-Id: Ia23869b823b5f9f578eea955f037393960bb02e0

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 16:25:35 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 22 Jul 2017 10:57:25 +0000 (03:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Add help uri for process stats summary and apps." into oc-dr1-dev
Andrew Sapperstein [Sat, 22 Jul 2017 00:32:32 +0000 (00:32 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77

Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52

7 years agoMerge "Add help uri for process stats summary and apps." into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 00:28:31 +0000 (00:28 +0000)]
Merge "Add help uri for process stats summary and apps." into oc-dr1-dev