jackqdyulei
66b633b71d
Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a am: 16afa828c7
...
am: 9b6a6e903d
2017-07-27 18:44:26 +00:00
jackqdyulei
9b6a6e903d
Merge "Don't update the header when toggle menu" into oc-dr1-dev am: 4ab4966e7a
...
am: 16afa828c7
2017-07-27 18:26:24 +00:00
jackqdyulei
16afa828c7
Merge "Don't update the header when toggle menu" into oc-dr1-dev
...
am: 4ab4966e7a
2017-07-27 18:21:16 +00:00
TreeHugger Robot
4ab4966e7a
Merge "Don't update the header when toggle menu" into oc-dr1-dev
2017-07-27 18:15:55 +00:00
Soroosh Mariooryad
30b6b769c3
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: e993ab19fc" into oc-mr1-dev-plus-aosp
...
am: 9c08a6cb1b
2017-07-27 18:15:27 +00:00
jackqdyulei
d544a5b663
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev am: ea7c30265c
...
am: 339c6ac7c2
2017-07-27 18:15:02 +00:00
Android Build Merger (Role)
9c08a6cb1b
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0 am: e993ab19fc" into oc-mr1-dev-plus-aosp
2017-07-27 17:57:03 +00:00
Soroosh Mariooryad
ae5aa96311
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am: c3bb4cd8c0
...
am: e993ab19fc
2017-07-27 17:56:43 +00:00
Soroosh Mariooryad
e993ab19fc
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
...
am: c3bb4cd8c0
2017-07-27 17:54:46 +00:00
TreeHugger Robot
ea7c30265c
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
2017-07-27 17:53:54 +00:00
Soroosh Mariooryad
a861d11027
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
2017-07-27 00:38:42 -07:00
Andrew Sapperstein
3b30cbee7d
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
...
am: 3bd56d970d
2017-07-27 05:41:58 +00:00
TreeHugger Robot
3bd56d970d
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
2017-07-27 05:37:49 +00:00
Matthew Fritze
9deb3f3c54
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e am: 68617a6f42
...
am: cba96eb672
2017-07-27 05:29:20 +00:00
Doris Ling
409091c5c9
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev am: 8e13218ec8
...
am: e866cd4825
2017-07-27 05:28:52 +00:00
Andrew Sapperstein
151fb83ea6
Merge "Add ambient notifications as inline setting." into oc-mr1-dev am: 5d7fab4f22
...
am: 8f25bc916a
2017-07-27 05:27:57 +00:00
Matthew Fritze
68617a6f42
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
...
am: c2cb0d0b9e
2017-07-27 01:20:02 +00:00
Matthew Fritze
9092e1a0b0
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
...
am: c2cb0d0b9e
2017-07-27 01:09:55 +00:00
jackqdyulei
aa5618fd82
Add ResultPayload for Allow notification dots
...
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-26 17:55:11 -07:00
TreeHugger Robot
8e13218ec8
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
2017-07-27 00:50:10 +00: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
5d7fab4f22
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
2017-07-26 23:34:22 +00:00
Ajay Nadathur
040db7c4f6
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 3c308aef22
...
am: 03737f1c9c
2017-07-26 22:53:03 +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
03737f1c9c
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
...
am: 3c308aef22
2017-07-26 22:16:46 +00:00
Ajay Nadathur
044485b850
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
...
am: f5ebc6f7ed
2017-07-26 22:02:33 +00: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
Andrew Sapperstein
e8e65a367b
Add ambient notifications as inline setting.
...
Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:19: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
Doris Ling
9042f822a6
Fix gestures summary text when there is no sensor for assit.
...
Should exit the summary handling if sensor is not available.
Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix: 64039312
Test: make RunSettingsRoboTests
2017-07-26 11:07:19 -07:00
Antony Sargent
1c84e34cb5
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
...
am: c3cd88c302
2017-07-26 16:19:02 +00:00
Antony Sargent
1e69f27a41
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
...
am: 9fb7a3b8b4
2017-07-26 16:18:50 +00: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
TreeHugger Robot
8eb816c940
Merge "Allow open password dialog for wrong-password wifi access points"
2017-07-26 07:23:37 +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
27e0f5f61f
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09 am: dfc2fb14c6
...
am: 85d9a7c48a
2017-07-26 06:42:11 +00:00
Jack He
85d9a7c48a
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
...
am: dfc2fb14c6
2017-07-26 06:38:32 +00:00
Jack He
a65e3e6795
Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
...
am: 0c6f001c09
2017-07-26 06:34:30 +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
Fan Zhang
a01c4e7e6a
Merge "Extract method to build preference count logging's name." into oc-dr1-dev am: 5fb56c5b37 am: 43ef9743a2
...
am: 6a8f288d3f
2017-07-26 06:23:01 +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
43ef9743a2
Merge "Extract method to build preference count logging's name." into oc-dr1-dev
...
am: 5fb56c5b37
2017-07-26 06:07:37 +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
Doris Ling
0224a409a9
Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev
2017-07-26 04:14:07 +00:00
