Andrew Sapperstein
7b445d59ef
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
2017-07-27 01:01:26 +00:00
Bill Yi
b0126e3500
Import translations. DO NOT MERGE am: 05185952c8 -s ours
...
am: 64ce525c6a
2017-07-27 00:55:57 +00:00
Bill Yi
e3e1e7b9d4
Import translations. DO NOT MERGE am: 05185952c8 -s ours
...
am: 64ce525c6a
2017-07-27 00:55:32 +00:00
Andrew Sapperstein
b3cf0a0923
Fix more config_headlineFontFamily-induced test breakages
...
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests
2017-07-26 17:41:48 -07:00
TreeHugger Robot
c2cb0d0b9e
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
2017-07-27 00:31:13 +00:00
TreeHugger Robot
02560caa92
Merge "Set minLines for battery header text" into oc-dr1-dev
2017-07-26 23:46:42 +00:00
Bill Yi
64ce525c6a
Import translations. DO NOT MERGE
...
am: 05185952c8
2017-07-26 23:22:33 +00:00
jackqdyulei
bc86e4747f
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
2017-07-26 15:28:59 -07:00
Ajay Nadathur
3c308aef22
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
...
am: f5ebc6f7ed
2017-07-26 22:02:05 +00:00
Ajay Nadathur
f5ebc6f7ed
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
2017-07-26 21:42:12 +00:00
Andrew Sapperstein
50ca1968e6
Add ambient notifications as inline setting.
...
Bug: 62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:20:19 +00:00
Matthew Fritze
c36ec8e629
Change SwipeForNotification Payload default to Off
...
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
2017-07-26 12:59:50 -07:00
jackqdyulei
dbe6bd3984
Set minLines for battery header text
...
So the header won't grow/shrink when the text changes.
Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
2017-07-26 11:24:54 -07:00
Bill Yi
05185952c8
Import translations. DO NOT MERGE
...
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 10:27:31 -07:00
Bill Yi
eca6781a49
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 402abcc9df
2017-07-26 17:04:23 +00:00
TreeHugger Robot
402abcc9df
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-26 16:31:13 +00:00
Bill Yi
d5390dac46
Import translations. DO NOT MERGE
...
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 07:32:24 -07:00
Antony Sargent
c3cd88c302
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
...
am: 9fb7a3b8b4
2017-07-26 11:12:39 +00:00
TreeHugger Robot
9fb7a3b8b4
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
2017-07-26 10:53:30 +00:00
Bill Yi
565664fad7
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 0c3ee7c15d
2017-07-26 08:24:19 +00:00
Bill Yi
0c3ee7c15d
Import translations. DO NOT MERGE
...
am: 8a25fb603a
2017-07-26 08:06:13 +00:00
Bill Yi
a2954b3232
Import translations. DO NOT MERGE am: 8a25fb603a -s ours
...
am: 9d7971905c
2017-07-26 08:03:05 +00:00
Bill Yi
9d7971905c
Import translations. DO NOT MERGE
...
am: 8a25fb603a
2017-07-26 07:59:05 +00:00
Antony Sargent
c00fedc639
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
2017-07-26 07:00:51 +00:00
Jack He
dfc2fb14c6
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
2017-07-26 06:34:29 +00:00
TreeHugger Robot
0c6f001c09
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
2017-07-26 06:28:44 +00:00
Doris Ling
3ab3fc9ee4
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
...
am: 4906a2a38a
2017-07-26 06:23:08 +00:00
TreeHugger Robot
4906a2a38a
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev
2017-07-26 06:11:07 +00:00
Fan Zhang
2583cbe16b
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
...
am: 5fb56c5b37
2017-07-26 06:07:30 +00:00
Fan Zhang
5fb56c5b37
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
2017-07-26 05:59:57 +00:00
Bill Yi
8a25fb603a
Import translations. DO NOT MERGE
...
Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-25 21:25:48 -07:00
Christine Franks
be0ac89704
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
...
am: a7e10e0316
2017-07-26 02:56:36 +00:00
Christine Franks
a7e10e0316
Merge "Restrict changing wi-fi networks" into oc-dr1-dev
2017-07-26 02:38:08 +00:00
Doris Ling
f8bb8a9792
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
...
am: 0e9711ab92
2017-07-26 02:08:44 +00:00
TreeHugger Robot
0e9711ab92
Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
2017-07-26 02:02:32 +00:00
Matthew Fritze
ee18f9f8aa
Merge "Add default value to inline payloads" into oc-dr1-dev
...
am: 5aca5f3aec
2017-07-26 01:57:29 +00:00
TreeHugger Robot
5aca5f3aec
Merge "Add default value to inline payloads" into oc-dr1-dev
2017-07-26 01:52:38 +00:00
Jack He
70f293ee50
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
2017-07-26 00:31:55 +00:00
Andrew Sapperstein
3db8c874f1
Merge "Fix robotests." into oc-dr1-dev
...
am: b5696a9162
2017-07-25 23:51:03 +00:00
Fan Zhang
ae70d2cd34
Extract method to build preference count logging's name.
...
Bug: 35066566
Test: robotests still pass
Change-Id: I665b7ecea9866227ef3cb06bf4aebacbfa2c65a9
2017-07-25 16:49:43 -07:00
Doris Ling
3230d95f9c
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
2017-07-25 16:40:30 -07:00
Andrew Sapperstein
b5696a9162
Merge "Fix robotests." into oc-dr1-dev
2017-07-25 23:37:37 +00:00
Andrew Sapperstein
1bb9b966ff
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
...
am: 5b67e453bf
2017-07-25 23:30:32 +00:00
Andrew Sapperstein
5b67e453bf
Merge "Make AirplaneModePrefController.isAvailable static." into oc-dr1-dev
2017-07-25 23:21:48 +00:00
Matthew Fritze
73056522b3
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
2017-07-25 14:37:05 -07:00
Fan Zhang
f854a08c3e
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
...
am: 6ef56e43ee
2017-07-25 21:30:26 +00:00
TreeHugger Robot
6ef56e43ee
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
2017-07-25 21:23:19 +00:00
Roshan Pius
974920af47
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
...
am: 2b689e63ca
2017-07-25 21:01:43 +00:00
Lei Yu
ce4ed05085
Merge "Add anomaly detection method to AnomalyUtils" into oc-dr1-dev
...
am: 5963ffd4e3
2017-07-25 20:55:21 +00:00
Roshan Pius
2b689e63ca
Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev
2017-07-25 20:52:29 +00:00
